Merge pull request #423 from marc1706/ticket/361

[ticket/361] Prepare package for 2.1.0-RC1 release

.gitattributes

@@ -10,3 +10,5 @@ git-tools/	export-ignore
 .coveralls.yml	export-ignore
 composer.phar	export-ignore
 composer.lock	export-ignore
+portal/upload/	export-ignore
+includes/functions_upload.php	export-ignore

acp/portal_module.php

@@ -81,7 +81,6 @@ class portal_module
 						'board3_left_column'		=> array('lang' => 'PORTAL_LEFT_COLUMN',		'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
 						'board3_right_column'		=> array('lang' => 'PORTAL_RIGHT_COLUMN',		'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
 						'board3_version_check'		=> array('lang' => 'PORTAL_VERSION_CHECK',		'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => false),
-						'board3_phpbb_menu'			=> array('lang' => 'PORTAL_PHPBB_MENU',			'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
 						'board3_display_jumpbox'	=> array('lang' => 'PORTAL_DISPLAY_JUMPBOX',	'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
 
 						'legend2'					=> 'ACP_PORTAL_COLUMN_WIDTH_SETTINGS',
@@ -185,8 +184,20 @@ class portal_module
 					{
 						if (!is_array($null['submit']))
 						{
-							$func = array($this->c_class, $null['submit']);
-							$args = ($module_id != 0) ? array($config_name, $module_id) : $config_name;
+							if (method_exists($this->c_class, $null['submit']))
+							{
+								$func = array($this->c_class, $null['submit']);
+								$args = ($module_id != 0) ? array($config_name, $module_id) : $config_name;
+							}
+							else if (function_exists($null['submit']))
+							{
+								$func = $null['submit'];
+								$args = ($module_id != 0) ? array($cfg_array[$config_name], $config_name, $module_id) : $config_name;
+							}
+							else
+							{
+								throw new \RuntimeException($this->user->lang('UNKNOWN_MODULE_METHOD', $module_data['module_classname']));
+							}
 						}
 						else
 						{
@@ -1171,10 +1182,11 @@ class portal_module
 				}
 				$confirm_text = (isset($this->user->lang[$module_data['module_name']])) ? sprintf($this->user->lang['DELETE_MODULE_CONFIRM'], $this->user->lang[$module_data['module_name']]) : sprintf($this->user->lang['DELETE_MODULE_CONFIRM'], utf8_normalize_nfc($module_data['module_name']));
 				confirm_box(false, $confirm_text, build_hidden_fields(array(
-					'i'			=> $id,
-					'mode'		=> $mode,
-					'action'	=> $action,
-					'module_id'	=> $module_id,
+					'i'					=> $id,
+					'mode'				=> $mode,
+					'action'			=> $action,
+					'module_id'			=> $module_id,
+					'module_classname'	=> $module_classname,
 				)));
 			}
 		}

adm/style/portal/acp_portal_links.html

@@ -54,6 +54,7 @@
 	</dl>
 	<p class="submit-buttons">
 		<input type="hidden" name="action" value="save" />
+		<!-- IF LINK_ID !== '' --><input type="hidden" name="id" value="{LINK_ID}" /><!-- ENDIF -->
 
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />

adm/style/portal/acp_portal_menu.html

@@ -61,6 +61,7 @@
 	</div>
 	<p class="submit-buttons">
 		<input type="hidden" name="action" value="save" />
+		<!-- IF LINK_ID !== '' --><input type="hidden" name="id" value="{LINK_ID}" /><!-- ENDIF -->
 
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />

composer.json

@@ -3,8 +3,8 @@
 	"type": "phpbb-extension",
 	"description": "Adds a portal with several blocks to your forum. You can change the settings, move the blocks, add new blocks and more in the ACP.",
 	"homepage": "http://www.board3.de",
-	"version": "2.1.0-b1",
-	"time": "2014-08-24 14:02:18",
+	"version": "2.1.0-rc1",
+	"time": "2014-11-26 14:23:15",
 	"license": "GPL-2.0",
 	"authors": [{
 			"name": "Marc Alexander",
@@ -29,7 +29,7 @@
 	"extra": {
 		"display-name": "Board3 Portal",
 		"soft-require": {
-			"phpbb/phpbb": ">=3.1.0-RC3,<3.2.*@dev"
+			"phpbb/phpbb": ">=3.1.2,<3.2.*@dev"
 		},
 		"version-check": {
 			"host": "board3.de",

config/modules.yml

@@ -59,6 +59,9 @@ services:
 
     board3.portal.module.clock:
         class: board3\portal\modules\clock
+        arguments:
+            - @config
+            - @template
         tags:
             - { name: board3.portal.module }
 

config/services.yml

@@ -5,12 +5,11 @@ parameters:
     board3.version_data:
         author: Marc
         title: Board3 Portal
-        tag: board3_portal_v2_dev
         version: board3_portal_version
         file:
             - board3.de
-            - updatecheck
-            - board3_portal.xml
+            - /updatecheck
+            - board3_portal.json
     board3.portal.config.table: %core.table_prefix%portal_config
     board3.portal.modules.table: %core.table_prefix%portal_modules
 
@@ -42,11 +41,11 @@ services:
 
     board3.portal.version.check:
         class: board3\portal\includes\version_check
+        scope: prototype
         arguments:
             - %board3.version_data%
             - @config
-            - %core.root_path%
-            - %core.php_ext%
+            - @version_helper
             - @template
             - @user
 
@@ -82,6 +81,8 @@ services:
     board3.portal.listener:
         class: board3\portal\event\listener
         arguments:
+            - @auth
+            - @config
             - @controller.helper
             - @path_helper
             - @template

controller/helper.php

@@ -191,7 +191,15 @@ class helper
 	{
 		if ($language_file = $module->get_language())
 		{
-			$this->user->add_lang_ext('board3/portal', 'modules/' . $language_file);
+			// Load language file from vendor if specified
+			if (is_array($language_file))
+			{
+				$this->user->add_lang_ext($language_file['vendor'], $language_file['file']);
+			}
+			else
+			{
+				$this->user->add_lang_ext('board3/portal', 'modules/' . $language_file);
+			}
 		}
 	}
 

event/listener.php

@@ -13,6 +13,12 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 class listener implements EventSubscriberInterface
 {
+	/** @var \phpbb\auth\auth */
+	protected $auth;
+
+	/** @var \phpbb\config\config */
+	protected $config;
+
 	/** @var \phpbb\controller\helper */
 	protected $controller_helper;
 
@@ -31,14 +37,18 @@ class listener implements EventSubscriberInterface
 	/**
 	* Constructor of Board3 Portal event listener
 	*
+	* @param \phpbb\auth\auth		$auth	phpBB auth object
+	* @param \phpbb\config\config		$config phpBB config
 	* @param \phpbb\controller\helper	$controller_helper	Controller helper object
 	* @param \phpbb\path_helper		$path_helper		phpBB path helper
 	* @param \phpbb\template\template	$template		Template object
 	* @param \phpbb\user			$user			User object
 	* @param string				$php_ext		phpEx
 	*/
-	public function __construct(\phpbb\controller\helper $controller_helper, \phpbb\path_helper $path_helper, \phpbb\template\template $template, \phpbb\user $user, $php_ext)
+	public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\controller\helper $controller_helper, \phpbb\path_helper $path_helper, \phpbb\template\template $template, \phpbb\user $user, $php_ext)
 	{
+		$this->auth = $auth;
+		$this->config = $config;
 		$this->controller_helper = $controller_helper;
 		$this->path_helper = $path_helper;
 		$this->template = $template;
@@ -92,12 +102,17 @@ class listener implements EventSubscriberInterface
 	}
 
 	/**
-	* Add portal link
+	* Add portal link if user is authed to see it
 	*
 	* @return null
 	*/
 	public function add_portal_link()
 	{
+		if (!$this->has_portal_access())
+		{
+			return;
+		}
+
 		if (strpos($this->user->data['session_page'], '/portal') === false)
 		{
 			$portal_link = $this->controller_helper->route('board3_portal_controller');
@@ -111,4 +126,14 @@ class listener implements EventSubscriberInterface
 			'U_PORTAL'	=> $portal_link,
 		));
 	}
+
+	/**
+	 * Check if user should be able to access portal
+	 *
+	 * @return bool True of user should be able to access it, false if not
+	 */
+	protected function has_portal_access()
+	{
+		return $this->auth->acl_get('u_view_portal') && $this->config['board3_enable'];
+	}
 }

includes/functions_upload.php

@@ -266,7 +266,7 @@ class portal_upload
 	* @param $from string Can be a file or a directory. Will move either the file or all files within the directory
 	* @param $to string Where to move the file(s) to. If not specified then will get moved to the root folder
 	* @param $strip Used for FTP only
-	* @return mixed: Bool true on success, error string on failure, NULL if no action was taken
+	* @return mixed Bool true on success, error string on failure, NULL if no action was taken
 	* 
 	* NOTE: function should preferably not return in case of failure on only one file.  
 	* 	The current method makes error handling difficult 

includes/version_check.php

@@ -22,14 +22,9 @@ class version_check
 	protected $config;
 
 	/**
-	* @var string phpbb_root_path
+	* @var \phpbb\version_helper $version_helper phpBB version helper
 	*/
-	protected $phpbb_root_path;
-
-	/**
-	* @var string PHP file extension
-	*/
-	protected $php_ext;
+	protected $version_helper;
 
 	/**
 	* @var \phpbb\template\twig\twig
@@ -41,125 +36,75 @@ class version_check
 	*/
 	protected $user;
 
+	/**
+	 * @var string Current version
+	 */
+	protected $current_version;
+
 	/**
 	* Construct a version_check object
 	*
 	* @param array $version_data Version data
 	* @param \phpbb\config\config $config phpBB config
-	* @param string $phpbb_root_path phpBB root path
-	* @param string $php_ext PHP file extension
+	* @param \phpbb\version_helper $version_helper phpBB version helper
 	* @param \phpbb\template\twig\twig $template phpBB template object
 	* @param \phpbb\user $user phpBB user object
 	*/
-	public function __construct($version_data, $config, $phpbb_root_path, $php_ext, $template, $user)
+	public function __construct($version_data, $config, $version_helper, $template, $user)
 	{
 		$this->version_data = $version_data;
 		$this->config = $config;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
+		$this->version_helper = $version_helper;
 		$this->template = $template;
 		$this->user = $user;
+		$this->current_version = $this->config[str_replace(' ', '', $this->version_data['version'])];
 	}
 
 	/**
-	* Check MOD version
+	* Check MOD version and assign template variables for version info if not
+	* returning current version
 	*
 	* @param bool $return_version Yes if current version should be returned
 	* @return string Current version if $return_version is set to true
 	*/
 	public function check($return_version = false)
 	{
-		if (!function_exists('get_remote_file'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_admin.' . $this->php_ext);
-		}
+		// Set file location
+		$this->version_helper->set_file_location($this->version_data['file'][0], $this->version_data['file'][1], $this->version_data['file'][2]);
+		// Set current version
+		$this->version_helper->set_current_version($this->current_version);
 
-		// Fill with bogus data
-		$this->get_empty_data($mod_version, $data);
+		$this->version_helper->force_stability(($this->config['extension_force_unstable'] || !$this->version_helper->is_stable($this->current_version)) ? 'unstable' : null);
 
-		// Get version info from server
-		$this->get_version_info($mod_version, $data);
+		$updates = $this->version_helper->get_suggested_updates(true);
 
-		// remove spaces from the version in the mod file stored locally
-		$version = $this->config[str_replace(' ', '', $this->version_data['version'])];
+		// Return version if $return_version is set to true
 		if ($return_version)
 		{
-			return $version;
+			return $this->current_version;
 		}
 
-		$version_compare = (version_compare($version, $mod_version, '<')) ? false : true;
+		$version_up_to_date = empty($updates);
 
-		$this->template->assign_block_vars('mods', array(
-			'ANNOUNCEMENT'		=> (string) $data['announcement'],
+		$template_data = array(
 			'AUTHOR'			=> $this->version_data['author'],
-			'CURRENT_VERSION'	=> $version,
-			'DESCRIPTION'		=> (string) $data['description'],
-			'DOWNLOAD'			=> (string) $data['download'],
-			'LATEST_VERSION'	=> $mod_version,
-			'TITLE'				=> (string) $data['title'],
-
-			'UP_TO_DATE'		=> sprintf((!$version_compare) ? $this->user->lang['NOT_UP_TO_DATE'] : $this->user->lang['UP_TO_DATE'], $data['title']),
-
-			'S_UP_TO_DATE'		=> $version_compare,
-
+			'CURRENT_VERSION'	=> $this->current_version,
+			'UP_TO_DATE'		=> sprintf((!$version_up_to_date) ? $this->user->lang['NOT_UP_TO_DATE'] : $this->user->lang['UP_TO_DATE'], $this->version_data['title']),
+			'S_UP_TO_DATE'		=> $version_up_to_date,
 			'U_AUTHOR'			=> 'http://www.phpbb.com/community/memberlist.php?mode=viewprofile&un=' . $this->version_data['author'],
-		));
-	}
-
-	/**
-	* Fill variables with empty bogus data
-	*
-	* @param string	$mod_version Mod version
-	* @param array	$data Array containing mod info
-	*
-	* @return null
-	*/
-	protected function get_empty_data(&$mod_version, &$data)
-	{
-		// Fill with bogus data
-		$mod_version = $this->user->lang['NO_INFO'];
-		$data = array(
-			'title'			=> $this->version_data['title'],
-			'description'	=> $this->user->lang['NO_INFO'],
-			'download'		=> $this->user->lang['NO_INFO'],
-			'announcement'	=> $this->user->lang['NO_INFO'],
+			'TITLE'				=> (string) $this->version_data['title'],
+			'LATEST_VERSION'	=> $this->current_version,
 		);
-	}
 
-	/**
-	* Get version info from remote server
-	*
-	* @param string	$mod_version Mod version
-	* @param array	$data Array containing mod info
-	*
-	* @return null
-	*/
-	protected function get_version_info(&$mod_version, &$data)
-	{
-		// Get current and latest version
-		$errstr = '';
-		$errno = 0;
-		$var = $this->version_data;
-
-		$file = get_remote_file($this->version_data['file'][0], '/' . $this->version_data['file'][1], $this->version_data['file'][2], $errstr, $errno);
-
-		if ($file)
+		if (!$version_up_to_date)
 		{
-			// let's not stop the page from loading if a mod author messed up their mod check file
-			// also take care of one of the easiest ways to mess up an xml file: "&"
-			$mod = @simplexml_load_string(str_replace('&', '&amp;', $file));
-			if (isset($mod->$var['tag']))
-			{
-				$row = $mod->$var['tag'];
-				$mod_version = $row->mod_version->major . '.' . $row->mod_version->minor . '.' . $row->mod_version->revision . $row->mod_version->release;
-
-				$data = array(
-					'title'			=> $row->title,
-					'description'	=> $row->description,
-					'download'		=> $row->download,
-					'announcement'	=> $row->announcement,
-				);
-			}
+			$updates = array_shift($updates);
+			$template_data = array_merge($template_data, array(
+				'ANNOUNCEMENT'		=> (string) $updates['announcement'],
+				'DOWNLOAD'			=> (string) $updates['download'],
+				'LATEST_VERSION'	=> $updates['current'],
+			));
 		}
+		$this->template->assign_block_vars('mods', $template_data);
 	}
 }

language/de/portal_acp.php

@@ -74,6 +74,7 @@ $lang = array_merge($lang, array(
 	'MODULE_STATUS'				=> 'Aktiviere Modul',
 	'MODULE_ADD_ONCE'			=> 'Diese Modul kann nur ein Mal hinzugefügt werden.',
 	'MODULE_IMAGE_ERROR'		=> 'Während dem Prüfen des Modul Bildes sind ein oder mehrere Fehler aufgetreten:',
+	'UNKNOWN_MODULE_METHOD'		=> 'Die Modul Methode des %1$s Moduls konnte nicht gefunden werden.',
 
 	// general
 	'ACP_PORTAL_CONFIG_INFO'				=> 'Allgemeine Einstellungen',
@@ -91,8 +92,6 @@ $lang = array_merge($lang, array(
 	'PORTAL_LEFT_COLUMN_WIDTH_EXP'			=> 'Ändere hier die Breite der linken Spalte in Pixel, empfohlener Wert 180',
 	'PORTAL_RIGHT_COLUMN_WIDTH'				=> 'Breite der rechten Spalte',
 	'PORTAL_RIGHT_COLUMN_WIDTH_EXP'			=> 'Ändere hier die Breite der rechten Spalte in Pixel, empfohlener Wert 180',
-	'PORTAL_PHPBB_MENU'						=> 'phpBB-Menü',
-	'PORTAL_PHPBB_MENU_EXP'					=> 'Den phpBB Header auf dem Portal anzeigen.',
 	'PORTAL_DISPLAY_JUMPBOX'				=> 'Zeige Jumpbox',
 	'PORTAL_DISPLAY_JUMPBOX_EXP'			=> 'Die Jumpbox auf dem Portal anzeigen. Die Jumpbox wird nur angezeigt, wenn sie gleichzeitig in den Board-Funktionalitäten aktiviert ist.',
 
@@ -131,5 +130,5 @@ $lang = array_merge($lang, array(
 	'NOT_UP_TO_DATE'			=> '%s ist nicht aktuell',
 	'RELEASE_ANNOUNCEMENT'	=> 'Ankündigungsthema',
 	'UP_TO_DATE'			=> '%s ist aktuell',
-	'VERSION_CHECK'			=> 'MOD Version Check',
+	'VERSION_CHECK'			=> 'Extension Version Check',
 ));

language/en/portal_acp.php

@@ -73,6 +73,7 @@ $lang = array_merge($lang, array(
 	'MODULE_STATUS'				=> 'Enable module',
 	'MODULE_ADD_ONCE'			=> 'This module can only be added once.',
 	'MODULE_IMAGE_ERROR'		=> 'There was an error while checking for the module image:',
+	'UNKNOWN_MODULE_METHOD'		=> 'The %1$s module’s module method couldn’t be resolved.',
 
 	// general
 	'ACP_PORTAL_CONFIG_INFO'				=> 'General settings',
@@ -85,8 +86,6 @@ $lang = array_merge($lang, array(
 	'PORTAL_RIGHT_COLUMN'					=> 'Enable right column',
 	'PORTAL_RIGHT_COLUMN_EXP'				=> 'Switch to no if you wish to turn off the right column',
 	'PORTAL_VERSION_CHECK'					=> 'Versioncheck on Portal',
-	'PORTAL_PHPBB_MENU'						=> 'phpBB menu',
-	'PORTAL_PHPBB_MENU_EXP'					=> 'Display the phpBB Header on the portal.',
 	'PORTAL_DISPLAY_JUMPBOX'				=> 'Display jumpbox',
 	'PORTAL_DISPLAY_JUMPBOX_EXP'			=> 'Display the jumpbox on the portal. The jumpbox will only be displayed if it is also enabled in the board features.',
 	'ACP_PORTAL_COLUMN_WIDTH_SETTINGS'		=> 'Left and right column width settings',
@@ -130,5 +129,5 @@ $lang = array_merge($lang, array(
 	'NOT_UP_TO_DATE'		=> '%s is not up to date',
 	'RELEASE_ANNOUNCEMENT'	=> 'Annoucement Topic',
 	'UP_TO_DATE'			=> '%s is up to date',
-	'VERSION_CHECK'			=> 'MOD Version Check',
+	'VERSION_CHECK'			=> 'Extension Version Check',
 ));

language/nl/info_acp_portal.php

@@ -0,0 +1,48 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'ACP_PORTAL_MODULES'		=> 'Portaal Modules',
+	'ACP_PORTAL'				=> 'Portaal',
+	'ACP_PORTAL_GENERAL_INFO'	=> 'Algemene instellingen',
+	'ACP_PORTAL_UPLOAD'			=> 'Upload module',
+	// Portal logs
+	'LOG_PORTAL_LINK_ADDED'				=> '<strong>Portaalinstellingen veranderd</strong><br />&raquo; Link toegevoegd: %s ',
+	'LOG_PORTAL_LINK_UPDATED'			=> '<strong>Portaalinstellingen veranderd</strong><br />&raquo; Link gewijzigd: %s ',
+	'LOG_PORTAL_LINK_REMOVED'			=> '<strong>Portaalinstellingen veranderd</strong><br />&raquo; Link verwijderd: %s ',
+	'LOG_PORTAL_EVENT_ADDED'			=> '<strong>Portaalinstellingen veranderd</strong><br />&raquo; Evenement toegevoegd: %s ',
+	'LOG_PORTAL_EVENT_UPDATED'			=> '<strong>Portaalinstellingen veranderd</strong><br />&raquo; Evenement gewijzigd: %s ',
+	'LOG_PORTAL_EVENT_REMOVED'			=> '<strong>Portaalinstellingen veranderd</strong><br />&raquo; Evenement verwijderd: %s ',
+	'LOG_PORTAL_CONFIG'					=> '<strong>Portaalinstellingen veranderd</strong><br />&raquo; %s',
+	// Adding the permissions
+	'ACL_A_MANAGE_PORTAL'		=> 'Kan portaalinstellingen wijzigen',
+	'ACL_U_VIEW_PORTAL'			=> 'Kan portaal bekijken',
+));

language/nl/modules/portal_announcements_module.php

@@ -0,0 +1,71 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Announcements
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'LATEST_ANNOUNCEMENTS'		=> 'Laatste algemene aankondigingen',
+	'GLOBAL_ANNOUNCEMENTS'		=> 'Algemene aankondigingen',
+	'GLOBAL_ANNOUNCEMENT'		=> 'Algemene aankondiging',
+	'VIEW_LATEST_ANNOUNCEMENT'  => '1 aankondiging',
+	'VIEW_LATEST_ANNOUNCEMENTS' => '%d aankondigingen',
+	'READ_FULL'					=> 'Lees alles',
+	'NO_ANNOUNCEMENTS'			=> 'Geen algemene aankondigingen',
+	'POSTED_BY'					=> 'Auteur',
+	'COMMENTS'					=> 'Reacties',
+	'VIEW_COMMENTS'				=> 'Bekijk reacties',
+	'PORTAL_POST_REPLY'			=> 'Schrijf reactie',
+	'TOPIC_VIEWS'				=> 'Weergaven',
+	'JUMP_NEWEST'				=> 'Spring naar nieuwste bericht',
+	'JUMP_FIRST'				=> 'spring naar eerste bericht',
+	'JUMP_TO_POST'				=> 'Spring naar bericht',
+	// ACP
+	'ACP_PORTAL_ANNOUNCE_SETTINGS'			=> 'Algemene aankondigingen instellingen',
+	'ACP_PORTAL_ANNOUNCE_SETTINGS_EXP'		=> 'Hier kan je de algemene aankondigingen blok aanpassen.',
+	'PORTAL_ANNOUNCEMENTS'					=> 'Algemene aankondigingen weergeven',
+	'PORTAL_ANNOUNCEMENTS_EXP'				=> 'Weergeeft dit blok op het portaal.',
+	'PORTAL_ANNOUNCEMENTS_STYLE'			=> 'Compacte algemene aankondigingen blokstijl',
+	'PORTAL_ANNOUNCEMENTS_STYLE_EXP'		=> '"Ja" betekent het gebruik van de compacte stijl voor algemene aankondigingen. "Nee" betekent het gebruik van de grote stijl (tekst weergave).',
+	'PORTAL_NUMBER_OF_ANNOUNCEMENTS'		=> 'Aantal aankondigingen op het portaal',
+	'PORTAL_NUMBER_OF_ANNOUNCEMENTS_EXP'	=> '0 betekent oneindig',
+	'PORTAL_ANNOUNCEMENTS_DAY'				=> 'Aantal dagen om de aankondiging weer te geven',
+	'PORTAL_ANNOUNCEMENTS_DAY_EXP'			=> '0 betekent oneindig',
+	'PORTAL_ANNOUNCEMENTS_LENGTH'			=> 'Maximum grootte/lengte van algemene aankondiging',
+	'PORTAL_ANNOUNCEMENTS_LENGTH_EXP'		=> '0 betekent oneindig',
+	'PORTAL_GLOBAL_ANNOUNCEMENTS_FORUM'		=> 'Aankondigingsforums',
+	'PORTAL_GLOBAL_ANNOUNCEMENTS_FORUM_EXP'	=> 'Forum(s) waaruit we de aankondigingen halen. Laat dit leeg om de aankondigingen uit alle forums te halen. Als "Forums uitsluiten" is ingesteld op "Ja", selecteer dan de forums die je wilt uitsluiten.<br />Als "Forums uitsluiten" is ingesteld op "Nee", selecteer dan de forums die je wilt zien.<br />Selecteer/Deselecteer meerdere forums door het vasthouden van <samp>CTRL</samp> en klikken met je muis.',
+	'PORTAL_ANNOUNCEMENTS_FORUM_EXCLUDE'	=> 'Forums uitsluiten',
+	'PORTAL_ANNOUNCEMENTS_FORUM_EXCLUDE_EXP'=> 'Selecteer "Ja" als je de geselecteerde forums wilt uitsluiten van de aankondigingen blok, en "Nee" als je alleen de geselecteerde forums wilt zien in de aankondigingen blok.',
+	'PORTAL_ANNOUNCEMENTS_PERMISSIONS'		=> 'Permissies in-/uitschakelen',
+	'PORTAL_ANNOUNCEMENTS_PERMISSIONS_EXP'	=> 'Tijdens het weergeven van aankondigingen, de gebruiker forum-weergave permissies in de gaten houden.',
+	'PORTAL_ANNOUNCEMENTS_ARCHIVE'			=> 'Het aankondigingen archiefsysteem inschakelen',
+	'PORTAL_ANNOUNCEMENTS_ARCHIVE_EXP'		=> 'Indien ingeschakeld, zal het aankondigingen archiefsyteem / paginanummers weergegeven worden.',
+	'PORTAL_SHOW_REPLIES_VIEWS'				=> 'Het aantal reacties en weergaven weergeven',
+	'PORTAL_SHOW_REPLIES_VIEWS_EXP'			=> 'Deze instelling betreft het compacte blok.<br />Wanneer “Ja” is geselecteerd, dan worden het aantal reacties en weergaven getoond in 2 extra kolommen. Wanneer “Nee” is geselecteerd, dan worden de reacties en weergaven naast de forumnaam getoond. Selecteer Nee als je problemen hebt met het weergeven van de extra kolommen vanwege de extra vereiste breedte.',
+));

language/nl/modules/portal_attachments_module.php

@@ -0,0 +1,51 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Attachments
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'DOWNLOADS'				=> 'Downloads',
+	'NO_ATTACHMENTS'		=> 'Geen bijlagen',
+	'PORTAL_ATTACHMENTS'	=> 'Bijlagen',
+	// ACP
+	'ACP_PORTAL_ATTACHMENTS_NUMBER_SETTINGS'		=> 'Bijlageninstellingen',
+	'ACP_PORTAL_ATTACHMENTS_NUMBER_SETTINGS_EXP'	=> 'Hier kan je het bijlagen blok aanpassen.',
+	'PORTAL_ATTACHMENTS_NUMBER'						=> 'Limiet van getoonde bijlagen',
+	'PORTAL_ATTACHMENTS_NUMBER_EXP'					=> '0 betekend onbeperkt',
+	'PORTAL_ATTACHMENTS_FORUM_IDS'					=> 'Bijlagen forums',
+	'PORTAL_ATTACHMENTS_FORUM_IDS_EXP'				=> 'De forumonderdelen waarvan de bijlagen moeten worden weergegeven. Als "Forumonderdelen uitsluiten" is ingesteld op "Ja", selecteer dan de forumonderdelen die je wilt uitsluiten.<br />Als "Forumonderdelen uitsluiten" is ingesteld op "Nee" selecteer dan de forumonderdelen die je wilt weergeven.<br />Selecteer/Deselecteer meerdere forums doormiddel van <samp>CTRL</samp> en door te klikken.',
+	'PORTAL_ATTACHMENTS_FORUM_EXCLUDE'				=> 'Forumonderdelen uitsluiten',
+	'PORTAL_ATTACHMENTS_FORUM_EXCLUDE_EXP'			=> 'Selecteer "Ja" als je de geselecteerde forumondedelen wilt uitsluiten uit het bijlagenblok, en "Nee" als je alleen de bijlages van de geselecteerde forumonderdelen wilt zien in het bijlagenblok.',
+	'PORTAL_ATTACHMENTS_MAX_LENGTH'					=> 'Limiet voor het aantal tekens voor bijlagen',
+	'PORTAL_ATTACHMENTS_MAX_LENGTH_EXP'				=> '0 betekend onbeperkt',
+	'PORTAL_ATTACHMENTS_FILETYPE' 					=> 'Bestandstypen',
+	'PORTAL_ATTACHMENTS_FILETYPE_EXP' 				=> 'Als "Bestandstypen uitsluiten" is ingesteld op "Ja", selecteer dan de bestandstypen die je wilt uitsluiten.<br />Als "Bestandstypen uitsluiten" is ingesteld op "Nee" selecteer dan de bestandstypen die je wilt weergeven.<br />Selecteer/Deselecteer meerdere bestandstypen doormiddel van <samp>CTRL</samp> en door te klikken.',
+	'PORTAL_ATTACHMENTS_EXCLUDE'					=> 'Bestandstypen uitsluiten',
+	'PORTAL_ATTACHMENTS_EXCLUDE_EXP'				=> 'Selecteer "Ja" als je de geselecteerde bestandstypen wilt uitsluiten uit het bijlagenblok, en "Nee" ls je alleen de bijlages van de geselecteerde bestandstypen wilt zien in het bijlagenblok.',
+));

language/nl/modules/portal_birthday_list_module.php

@@ -0,0 +1,41 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Birthday List
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'BIRTHDAYS_AHEAD'			=> 'In de volgende %s dagen',
+	'NO_BIRTHDAYS_AHEAD'		=> 'Er zijn geen gebruikers jarig, binnen deze periode.',
+	// ACP
+	'ACP_PORTAL_BIRTHDAYS_SETTINGS'		=> 'Verjaardagsinstellingen',
+	'ACP_PORTAL_BIRTHDAYS_SETTINGS_EXP'	=> 'Hier kan je het verjaardagsblok aanpassen.',
+	'PORTAL_BIRTHDAYS'					=> 'Verjaardagsblok',
+	'PORTAL_BIRTHDAYS_AHEAD'			=> 'Aankomende verjaardagen',
+	'PORTAL_BIRTHDAYS_AHEAD_EXP'		=> 'Hoeveel dagen moet er vooruit gekeken worden voor aankomende verjaardagen.<br />"0" zal de aankomende lijst met verjaardagen uitschakelen.',
+));

language/nl/modules/portal_calendar_module.php

@@ -0,0 +1,124 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Calendar
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_CALENDAR'		=> 'Kalender',
+	'VIEW_NEXT_MONTH'		=> 'Volgende maand',
+	'VIEW_PREVIOUS_MONTH'	=> 'Vorige maand',
+	'EVENT_START'			=> 'Van',
+	'EVENT_END'				=> 'Tot',
+	'EVENT_TIME'			=> 'Tijd',
+	'EVENT_ALL_DAY'			=> 'De hele dag',
+	'CURRENT_EVENTS'		=> 'Huidige evenementen ',
+	'NO_CUR_EVENTS'			=> 'Geen huidige evenementen ',
+	'UPCOMING_EVENTS'		=> 'Aankomende evenementen ',
+	'NO_UPCOMING_EVENTS'	=> 'Geen aankomende evenementen ',
+	'mini_cal'	=> array(
+		'day'	=> array(
+			'1'	=> 'Zo',
+			'2'	=> 'Ma',
+			'3'	=> 'Di',
+			'4'	=> 'Wo',
+			'5'	=> 'Do',
+			'6'	=> 'Vr',
+			'7'	=> 'Za',
+		),
+		'month'	=> array(
+			'1'	=> 'Jan.',
+			'2'	=> 'Feb.',
+			'3'	=> 'Mar.',
+			'4'	=> 'Apr.',
+			'5'	=> 'Mei.',
+			'6'	=> 'Jun.',
+			'7'	=> 'Jul.',
+			'8'	=> 'Aug.',
+			'9'	=> 'Sep.',
+			'10'=> 'Okt.',
+			'11'=> 'Nov.',
+			'12'=> 'Dec.',
+		),
+		'long_month'=> array(
+			'1'	=> 'Januari',
+			'2'	=> 'Februari',
+			'3'	=> 'Maart',
+			'4'	=> 'April',
+			'5'	=> 'Mei',
+			'6'	=> 'Juni',
+			'7'	=> 'Juli',
+			'8'	=> 'Augustus',
+			'9'	=> 'September',
+			'10'=> 'Oktober',
+			'11'=> 'November',
+			'12'=> 'December',
+		),
+	),
+	// ACP
+	'ACP_PORTAL_CALENDAR'					=> 'Kalender instellingen',
+	'ACP_PORTAL_CALENDAR_EXP'				=> 'Hier kan je het Kalanderblok aanpassen.',
+	'ACP_PORTAL_EVENTS'						=> 'Kalender evenementen',
+	'PORTAL_CALENDAR_TODAY_COLOR'			=> 'Kleur voor de huidige dag',
+	'PORTAL_CALENDAR_TODAY_COLOR_EXP'		=> 'HEX of kleurnamen zijn toegestaan, zoals #FFFFFF voor wit, of kleurnamen in het engels zoals violet.',
+	'PORTAL_CALENDAR_SUNDAY_COLOR'			=> 'Kleur voor zondag',
+	'PORTAL_CALENDAR_SUNDAY_COLOR_EXP'		=> 'HEX of kleurnamen zijn toegestaan, zoals #FFFFFF voor wit, of kleurnamen in het engels zoals violet.',
+	'PORTAL_LONG_MONTH'						=> 'Laat volledige maand naam zien',
+	'PORTAL_LONG_MONTH_EXP'					=> 'Als deze functie is uitgeschakeld wordt de maand verkort bijv: Aug. in plaats van Augustus.',
+	'PORTAL_SUNDAY_FIRST'					=> 'Eerste dag van de week',
+	'PORTAL_SUNDAY_FIRST_EXP'				=> 'Als deze functie is uitgeschakeld begint de week met, Ma. --> Zo., anders Zo. --> Za.',
+	'PORTAL_DISPLAY_EVENTS'					=> 'Laat evenementen zien',
+	'PORTAL_DISPLAY_EVENTS_EXP'				=> 'Laat evenementen zien die zijn aangemaakt in het kalenderblok',
+	'PORTAL_EVENTS_MANAGE'					=> 'Beheer evenementen',
+	'NO_EVENT_TITLE'						=> 'Je hebt geen titel voor dit evenement opgegeven.',
+	'NO_EVENT_START'						=> 'Je hebt geen startdatum voor dit evenement opgegeven.',
+	'ADD_EVENT'								=> 'Voeg een nieuw evenement toe',
+	'EVENT_UPDATED'							=> 'Evenement succesvol gewijzigd.',
+	'EVENT_ADDED'							=> 'Evenement succesvol toegevoegd.',
+	'NO_EVENT'								=> 'Geen evenement gespecificeerd .',
+	'EVENT_TITLE'							=> 'Evenementtitel',
+	'EVENT_DESC'							=> 'Evenementomschrijving',
+	'EVENT_LINK'							=> 'Evenementlink',
+	'EVENT_LINK_EXP'						=> 'Plaats hier een link naar het onderwerp of de website, met de aankondiging of discussieonderwerp van dit evenement.',
+	'NO_EVENTS'								=> 'Geen evenementen',
+	'ACP_PORTAL_CALENDAR_START_INCORRECT'	=> 'De startdatum die je hebt opgegeven was incorrect. Volg de instructies nauwkeurig.',
+	'ACP_PORTAL_CALENDAR_END_INCORRECT'		=> 'De einddatum die je hebt opgegeven was incorrect. Volg de instructies nauwkeurig.',
+	'ACP_PORTAL_CALENDAR_EVENT_PAST'		=> 'De startdatum van het evenement moet in de toekomst zijn.',
+	'ACP_PORTAL_EVENT_START_DATE'			=> 'Begindatum evenement',
+	'ACP_PORTAL_EVENT_START_DATE_EXP'		=> 'Vul de datum en tijd in wanneer het evenement begint. De datum moet in een soortgelijke vorm: MM/DD/JJJJ 3:00 PM',
+	'ACP_PORTAL_EVENT_END_DATE'				=> 'Einddatum evenement',
+	'ACP_PORTAL_EVENT_END_DATE_EXP'			=> 'Vul de datum en tijd in wanneer het evenement eindigt. De datum moet in een soortgelijke vorm: MM/DD/JJJJ 3:00 PM',
+	'ACP_PORTAL_CALENDAR_EVENT_START_FIRST'	=> 'Het einde van het evenement moet na de start van het evenement zijn.',
+	'ACP_PORTAL_CALENDAR_PERMISSION'		=> 'Evenementpermissies',
+	'ACP_PORTAL_CALENDAR_PERMISSION_EXP'	=> 'Selecteer de groepen die dit evenement mogen zien. Als je wilt dat alle gebruikers dit evenement mogen zien, selecteer dan niks.<br />>Selecteer/Deselecteer meerdere groepen door middel van <samp>CTRL</samp> en door te klikken.',
+	'PORTAL_EVENTS_URL_NEW_WINDOW'			=> 'Open externe evenementlinks in een nieuw venster',
+	// Logs
+	'LOG_PORTAL_EVENT_UPDATED'				=> '<strong>Evenement gewijzigd</strong><br />&raquo; %s',
+	'LOG_PORTAL_EVENT_ADDED'				=> '<strong>Evenement toegevoegd</strong><br />&raquo; %s',
+	'LOG_PORTAL_EVENT_REMOVED'				=> '<strong>Evenement verwijderd</strong><br />&raquo; %s',
+));

language/nl/modules/portal_clock_module.php

@@ -0,0 +1,39 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Clock
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'CLOCK'		=> 'Klok',
+	// ACP
+	'ACP_PORTAL_CLOCK_SETTINGS'		=> 'Klokinstellingen',
+	'ACP_PORTAL_CLOCK_SETTINGS_EXP'	=> 'Hier kan je het klokblok aanpassen',
+	'ACP_PORTAL_CLOCK_SRC'			=> 'Klok',
+	'ACP_PORTAL_CLOCK_SRC_EXP'		=> 'Vul de bestandsnaam van je klok in. De klok moet in styles/*jouwstijl*/theme/images/portal/ staan.',
+));

language/nl/modules/portal_custom_module.php

@@ -0,0 +1,45 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Custom
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_CUSTOM'		=> 'Aangepast blok',
+	// ACP
+	'ACP_PORTAL_CUSTOM_SETTINGS'			=> 'Aangepast blok Instelingen',
+	'ACP_PORTAL_CUSTOM_SETTINGS_EXP'		=> 'Hier kan je het aangepaste blok aanpassen',
+	'ACP_PORTAL_CUSTOM_CODE_SHORT'			=> 'De code die je hebt ingevoerd is niet lang genoeg.',
+	'ACP_PORTAL_CUSTOM_PREVIEW'				=> 'Voorbeeld',
+	'ACP_PORTAL_CUSTOM_CODE'				=> 'Code aangepast blok',
+	'ACP_PORTAL_CUSTOM_CODE_EXP'			=> 'Verander de code voor het smalle aangepaste blok (HTML of BBCode) hier.',
+	'ACP_PORTAL_CUSTOM_PERMISSION'			=> 'Aangepast blok permissies',
+	'ACP_PORTAL_CUSTOM_PERMISSION_EXP'		=> 'Selecteer de groepen die het aangepaste blok mogen zien. Als je wilt dat alle gebruikers dit aangepaste blok mogen zien, selecteer dan niks.<br />Selecteer/Deselecteer meerdere groepen door middel van <samp>CTRL</samp> en door te klikken.',
+	'ACP_PORTAL_CUSTOM_BBCODE'				=> 'Activeer BBCode voor het aangepaste blok',
+	'ACP_PORTAL_CUSTOM_BBCODE_EXP'			=> 'Je kan BBcodes gebruiken in dit vak. Als BBCodes niet geactiveerd zijn, zal HTML verwerkt worden.',
+));

language/nl/modules/portal_donation_module.php

@@ -0,0 +1,61 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Donation
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'DONATION' 		=> 'PayPal donaties',
+	'DONATION_TEXT'	=> 'is een groep die is gericht op het leveren van diensten en heeft geen enkele intentie om er zelf financieel beter van te worden. Je donatie is van harte welkom, zodat de kosten van onze server, domeinnaam, etc. kunnen worden gedekt.',
+	'PAY_MSG'       => 'Gebruik een decimale punt (geen komma) als scheidingsteken, bijv: 3.50',
+	'PAY_ITEM'		=> 'Doneer!', // paypal item
+	'AUD'						=> 'Australische Dollars (AUD)',
+	'CAD'						=> 'Canadese Dollars (CAD)',
+	'CZK'						=> 'Tsjechische Kroon (CZK)',
+	'DKK'						=> 'Deense Kronen (DKK)',
+	'HKD'						=> 'Hong Kong Dollars (HKD)',
+	'HUF'						=> 'Hongaarse Forint (HUF)',
+	'NZD'						=> 'Nieuw-Zeelandse Dollars (NZD)',
+	'NOK'						=> 'Noorse Kronen (NOK)',
+	'PLN'						=> 'Poolse Zloty (PLN)',
+	'GBP'						=> 'Britse Ponden (GBP)',
+	'SGD'						=> 'Singaporese Dollars (SGD)',
+	'SEK'						=> 'Zweedse Kronen (SEK)',
+	'CHF'						=> 'Zwitserse Franken (CHF)',
+	'JPY'						=> 'Japanse Yen (JPY)',
+	'USD'						=> 'U.S. Dollars (USD)',
+	'EUR'						=> 'Euros (EUR)',
+	'MXN'						=> 'Mexicaanse Peso (MXN)',
+	'ILS'						=> 'Israëlische Shekel (ILS)',
+	// ACP
+	'ACP_PORTAL_PAYPAL_SETTINGS'			=> 'PayPal instellingen',
+	'ACP_PORTAL_PAYPAL_SETTINGS_EXP'		=> 'Hier kan je het PayPal blok aanpassen.',
+	'PORTAL_PAY_ACC'						=> 'PayPal account om te gebruiken',
+	'PORTAL_PAY_ACC_EXP'					=> 'Vul je Paypal e-mailadres in bijv: xxx@xxx.com',
+	'PORTAL_PAY_CUSTOM'						=> 'Voeg gebruikersnaam toe bij een PayPal donatie',
+));

language/nl/modules/portal_forumlist_module.php

@@ -0,0 +1,34 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Forumlist
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_FORUMLIST'		=> 'Forumlijst',
+));

language/nl/modules/portal_friends_module.php

@@ -0,0 +1,44 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Friends
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'FRIENDS'				=> 'Vrienden',
+	'FRIENDS_OFFLINE'		=> 'Offline',
+	'FRIENDS_ONLINE'		=> 'Online',
+	'NO_FRIENDS'			=> 'Op dit moment zijn er geen vrienden gedefinieerd',
+	'NO_FRIENDS_OFFLINE'	=> 'Geen vrienden offline',
+	'NO_FRIENDS_ONLINE'		=> 'Geen vrienden online',
+	// ACP
+	'ACP_PORTAL_FRIENDS_SETTINGS'		=> 'Vrienden instellingen',
+	'ACP_PORTAL_FRIENDS_SETTINGS_EXP'	=> 'Hier kan je het vrienden blok aanpassen.',
+	'PORTAL_MAX_ONLINE_FRIENDS'			=> 'Aantal getoonde vrienden',
+	'PORTAL_MAX_ONLINE_FRIENDS_EXP'		=> 'Het maximum aantal vrienden dat wordt weergegeven.',
+));

language/nl/modules/portal_latest_bots_module.php

@@ -0,0 +1,40 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Latest Bots
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'LATEST_BOTS'			=> 'Nieuwste Bots',
+	'LAST_VISITED_BOTS'		=> 'Laatste bezoekende bots',
+	// ACP
+	'ACP_PORTAL_BOTS_SETTINGS'				=> 'Bezoekende bots instellingen',
+	'ACP_PORTAL_BOTS_SETTINGS_EXP'			=> 'Hier kan je de bezoekende  bots blok aanpassen.',
+	'PORTAL_LAST_VISITED_BOTS_NUMBER'		=> 'Hoeveel bot weergeven',
+	'PORTAL_LAST_VISITED_BOTS_NUMBER_EXP'	=> '0 betekent oneindig',
+));

language/nl/modules/portal_latest_members_module.php

@@ -0,0 +1,39 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Latest Members
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'LATEST_MEMBERS'	=> 'Nieuwste gebruikers',
+	// ACP
+	'ACP_PORTAL_MEMBERS_SETTINGS'		=> 'Nieuwste gebruikers instellingen',
+	'ACP_PORTAL_MEMBERS_SETTINGS_EXP'	=> 'Hier kan je het nieuwste gebruikers blok aanpassen.',
+	'PORTAL_MAX_LAST_MEMBER'			=> 'Aantal getoonde nieuwe gebruikers',
+	'PORTAL_MAX_LAST_MEMBER_EXP'		=> 'Het maximum aantal nieuwe gebruikers dat wordt weergegeven, 0 is onbeperkt',
+));

language/nl/modules/portal_leaders_module.php

@@ -0,0 +1,42 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Leaders
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'NO_ADMINISTRATORS_P'	=> 'Geen Beheerders',
+	'NO_MODERATORS_P'		=> 'Geen Moderators',
+	'NO_GROUPS_P'			=> 'Geen groepen',
+	'ACP_PORTAL_LEADERS'	=> 'Het Team',
+	// ACP
+	'ACP_PORTAL_LEADERS'		=> 'Team Instellingen',
+	'ACP_PORTAL_LEADERS_EXP'	=> 'Hier kan je het team blok aanpassen',
+	'PORTAL_LEADERS_EXT'		=> 'Uitgebreide leiders/teams',
+	'PORTAL_LEADERS_EXT_EXP'	=> 'Het standaard blok weergeeft alle beheerders/moderators, het uitgebreide blok weergeeft alle niet-verborgen groepen met legenda.',
+));

language/nl/modules/portal_link_us_module.php

@@ -0,0 +1,35 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Link Us
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'LINK_US'		=> 'Link naar ons',
+	'LINK_US_TXT'	=> 'Voel je vrij om te linken naar <strong>%s</strong>. door middel van deze HTML code:',
+));

language/nl/modules/portal_links_module.php

@@ -0,0 +1,52 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Links
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_LINKS'		=> 'Links',
+	'LINKS_NO_LINKS'	=> 'Geen links',
+	// ACP
+	'ACP_PORTAL_LINKS'				=> 'Link instellingen',
+	'ACP_PORTAL_LINKS_EXP'			=> 'Pas de links aan die in de linksblok staan aan',
+	'ACP_PORTAL_LINK_TITLE'			=> 'Titel',
+	'ACP_PORTAL_LINK_TYPE'			=> 'Linktype',
+	'ACP_PORTAL_LINK_TYPE_EXP'		=> 'Als je een link naar een pagina van je forum hebt, kies dan "Interne link" om ongewenste afmeldingen te voorkomen.',
+	'ACP_PORTAL_LINK_INT'			=> 'Interne link',
+	'ACP_PORTAL_LINK_EXT'			=> 'Externe link',
+	'ACP_PORTAL_LINK_ADD'			=> 'Nieuwe navigatielink toevoegen',
+	'ACP_PORTAL_LINK_URL'			=> 'Link-URL',
+	'ACP_PORTAL_LINK_URL_EXP'		=> 'Externe links:<br />Alle links moeten ingevoerd worden met een http://<br /><br />Interne links:<br />Vul alleen het php bestand in als link-url, bijv. index.php?style=4.',
+	'ACP_PORTAL_LINK_PERMISSION'	=> 'Linkpermissies',
+	'ACP_PORTAL_LINK_PERMISSION_EXP'=> 'Selecteer de groepen die de link kunnen zien. Als je wilt dat alle gebruikers de link kunnen zien, selecteer dan niks.<br />Selecteer/Deselecteer meerdere groepen door middel van <samp>CTRL</samp> en klikken.',
+	'ACP_PORTAL_LINKS_NEW_WINDOW'	=> 'Open externe links in een nieuw scherm',
+	// Errors
+	'NO_LINK_TITLE'					=> 'Je moet een titel invoeren voor deze link.',
+	'NO_LINK_URL'					=> 'Je moet een link-URL invoeren.',
+));

language/nl/modules/portal_main_menu_module.php

@@ -0,0 +1,65 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Main Menu
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'M_MENU' 	=> 'Menu',
+	'M_CONTENT'	=> 'Inhoud',
+	'M_ACP'		=> 'ACP',
+	'M_HELP'	=> 'Help',
+	'M_BBCODE'	=> 'BBCode FAQ',
+	'M_TERMS'	=> 'Gebruikersvoorwaarden',
+	'M_PRV'		=> 'Privacybeleid',
+	'M_SEARCH'	=> 'Zoek',
+	'MENU_NO_LINKS'	=> 'Geen links',
+	// ACP
+	'ACP_PORTAL_MENU'				=> 'Menu instellingen',
+	'ACP_PORTAL_MENU_LINK_SETTINGS'	=> 'Link instellingen',
+	'ACP_PORTAL_MENU_EXP'			=> 'Beheer je hoofdmenu',
+	'ACP_PORTAL_MENU_MANAGE'		=> 'Beheer menu',
+	'ACP_PORTAL_MENU_MANAGE_EXP'	=> 'Hier kan je de links van je hoofdmenu beheren.',
+	'ACP_PORTAL_MENU_CAT'			=> 'Categorie',
+	'ACP_PORTAL_MENU_IS_CAT'		=> 'Stel in als speciale linkcategorie',
+	'ACP_PORTAL_MENU_INT'			=> 'Interne link',
+	'ACP_PORTAL_MENU_EXT'			=> 'Externe link',
+	'ACP_PORTAL_MENU_TITLE'			=> 'Titel',
+	'ACP_PORTAL_MENU_URL'			=> 'Link-URL',
+	'ACP_PORTAL_MENU_ADD'			=> 'Nieuwe navigatielink toevoegen',
+	'ACP_PORTAL_MENU_TYPE'			=> 'Linktype',
+	'ACP_PORTAL_MENU_TYPE_EXP'		=> 'Als je een link naar een pagina op je forum hebt, selecteer dan "Interne link" om ongewenst afmelden te voorkomen.',
+	'ACP_PORTAL_MENU_CREATE_CAT'	=> 'Je moet eerst een categorie aanmaken.',
+	'ACP_PORTAL_MENU_URL_EXP'		=> 'Externe links:<br />Alle links moeten worden ingevoerd met http://<br /><br />Interne link:<br />Voer alleen het php-bestand in als link, d.w.z. index.php?style=4.',
+	'ACP_PORTAL_MENU_PERMISSION'	=> 'Link permissies',
+	'ACP_PORTAL_MENU_PERMISSION_EXP'=> 'Selecteer de groepen die de link mogen bekijken. Als alle gebruikers de link mogen bekijken, selecteer dan niets.<br />Selecteer/Deselecteer meerdere groepen doormiddel van <samp>CTRL</samp> en door te klikken.',
+	'ACP_PORTAL_MENU_EXT_NEW_WINDOW'=> 'Open externe links in een nieuw venster',
+	// Errors
+	'NO_LINK_TITLE'					=> 'Je moet een titel opgeven voor deze link.',
+	'NO_LINK_URL'					=> 'Je moet een link opgeven.',
+));

language/nl/modules/portal_news_module.php

@@ -0,0 +1,67 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - News
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'LATEST_NEWS'			=> 'Laatste Nieuws',
+	'READ_FULL'				=> 'Lees alles',
+	'NO_NEWS'				=> 'Geen nieuws',
+	'POSTED_BY'				=> 'Geplaatst door',
+	'COMMENTS'				=> 'Reacties',
+	'VIEW_COMMENTS'			=> 'Laat reacties zien',
+	'PORTAL_POST_REPLY'		=> 'Schrijf een reactie',
+	'TOPIC_VIEWS'			=> 'Weergaves',
+	'JUMP_NEWEST'			=> 'Ga naar nieuwste bericht',
+	'JUMP_FIRST'			=> 'Ga naar eerste bericht',
+	'JUMP_TO_POST'			=> 'Ga naar bericht',
+	// ACP
+	'ACP_PORTAL_NEWS_SETTINGS'			=> 'Nieuws instellingen',
+	'ACP_PORTAL_NEWS_SETTINGS_EXP'	=> 'Hier kan je het nieuwsblok aanpassen.',
+	'PORTAL_NEWS_STYLE'					=> 'Compacte nieuwsblok stijl',
+	'PORTAL_NEWS_STYLE_EXP'			=> '"Ja" betekend dat je gebruik wilt maken van de compate stijl. "Nee" betekend dat je gebruik wilt maken van de grote stijl (tekstweergave).',
+	'PORTAL_SHOW_ALL_NEWS'				=> 'Alle artikelen tonen in dit forum',
+	'PORTAL_SHOW_ALL_NEWS_EXP'		=> 'inclusief stickies.',
+	'PORTAL_NUMBER_OF_NEWS'				=> 'Het aantal nieuwsberichten weergeven op het portaal',
+	'PORTAL_NUMBER_OF_NEWS_EXP'		=> '0 betekend onbeperkt',
+	'PORTAL_NEWS_LENGTH'				=> 'Maximale lengte nieuwsberichten',
+	'PORTAL_NEWS_LENGTH_EXP'		=> '0 betekend onbeperkt',
+	'PORTAL_NEWS_FORUM' 				=> 'Nieuws forums',
+	'PORTAL_NEWS_FORUM_EXP' 		=> 'Forumonderdeel om te gebruiken voor nieuwsberichten, laat dit leeg om alle forumonderdelen te gebruiken. Als "Forumonderdelen uitsluiten" is ingesteld op "Ja", selecteer dan de forumonderdelen die je wilt uitsluiten.<br />Als "Forumonderdelen uitsluiten" is ingesteld op "Nee" selecteer dan de forumonderdelen die je wilt weergeven.<br />Selecteer/Deselecteer meerdere forumonderdelen doormiddel van <samp>CTRL</samp> en door te klikken.',
+	'PORTAL_NEWS_EXCLUDE'				=> 'Forumonderdelen uitsluiten',
+	'PORTAL_NEWS_EXCLUDE_EXP'		=> 'Selecteer "Ja" als je de geselecteerde forumonderdelen wilt uitsluiuten van het nieuwsblok, selecteer "Nee" als je alleen de geselecteerde forumonderdelen wilt weergeven in het nieuwsblok.',
+	'PORTAL_NEWS_PERMISSIONS'			=> 'Inschakelen/uitschakelen permissies',
+	'PORTAL_NEWS_PERMISSIONS_EXP'	=> 'Take forum viewing permissions into account when displaying news',
+	'PORTAL_NEWS_SHOW_LAST'				=> 'Sorteeren op laatste berichten',
+	'PORTAL_NEWS_SHOW_LAST_EXP'		=> ',Indien ingeschakelt, wordt het nieuws gesorteerd op laatste berichten. Indien uitgeschakeklt, wordt het nieuws gesorteerd op het laatst geplaatste onderwerp.',
+	'PORTAL_NEWS_ARCHIVE'				=> 'Het nieuwsarchief systeem inschakelen',
+	'PORTAL_NEWS_ARCHIVE_EXP'		=> 'Als het nieuwsarchief systeem is ingeschakelt, worden er paginanummers weergegeven.',
+	'PORTAL_SHOW_REPLIES_VIEWS'				=> 'Laat het aantal reacties en weergaves zien',
+	'PORTAL_SHOW_REPLIES_VIEWS_EXP'		=> 'Deze instelling betreft het compacte blok.<br />Als "Ja" is ingesteld, wordt het aantal reacties en weergaves weergegeven in 2 extra kolommen. Als "Nee" is ingesteld, worden reacties en weergaves weergegeven naast de forumnaam. Selecteer Nee, als je problemen hebt met de weergave van de extra kolommen doordat er extra breedte nodig is.',
+));

language/nl/modules/portal_poll_module.php

@@ -0,0 +1,50 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Poll
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_POLL'			=> 'Poll',
+	'LATEST_POLLS'			=> 'Laatste Polls',
+	'NO_OPTIONS'			=> 'Deze poll heeft geen beschikbare opties.',
+	'NO_POLL'				=> 'Geen polls beschikbaar',
+	'RETURN_PORTAL'			=> '%sGa terug naar het portaal%s',
+	// ACP
+	'ACP_PORTAL_POLLS_SETTINGS'			=> 'Poll instellingen',
+	'ACP_PORTAL_POLLS_SETTINGS_EXP'	=> 'Hier kan je het poll blok aanpassen.',
+	'PORTAL_POLL_TOPIC_ID'				=> 'Poll forum(s)',
+	'PORTAL_POLL_TOPIC_ID_EXP'		=> 'De forumonderdelen waarvan je de polls wilt weergeven. Als "Forumonderdelen uitsluiten" is ingesteld op "Ja", selecteer dan de forumonderdelen die je wilt uitsluiten.<br />Als "Forumonderdelen uitsluiten" is ingesteld op "Nee" selecteer dan de forumonderdelen die je wilt weergeven.<br />Selecteer/Deselecteer meerdere forumonderdelen doormiddel van <samp>CTRL</samp> en door te klikken.',
+	'PORTAL_POLL_EXCLUDE_ID'			=> 'Forumonderdelen uitsluiten',
+	'PORTAL_POLL_EXCLUDE_ID_EXP'	=> 'Selecteer "Ja" als je de geselecteerde forumonderdelen wilt uitsluiten in het poll blok, en "Nee" als je alleen de geselecteerde forumonderdelen wilt weergeven in het poll blok.',
+	'PORTAL_POLL_LIMIT'					=> 'Aantal polls weergeven',
+	'PORTAL_POLL_LIMIT_EXP'			=> 'Het aantal polls dat je wilt weergeven op de portaalpagina.',
+	'PORTAL_POLL_ALLOW_VOTE'			=> 'Sta stemmen toe',
+	'PORTAL_POLL_ALLOW_VOTE_EXP'	=> 'Sta gebruikers met de vereiste permissies toe om te stemmen vanaf de portaalpagina.',
+	'PORTAL_POLL_HIDE'					=> 'Verberg verlopen polls?',
+));

language/nl/modules/portal_random_member_module.php

@@ -0,0 +1,39 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Random Member
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_RANDOM_MEMBER'	=> 'Willikeurige gebruiker',
+	'RND_JOIN'				=> 'Geregistreerd',
+	'RND_POSTS'				=> 'Berichten',
+	'RND_OCC'				=> 'Beroep',
+	'RND_FROM'				=> 'Locatie',
+	'RND_WWW'				=> 'Website',
+));

language/nl/modules/portal_recent_module.php

@@ -0,0 +1,48 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Recent
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_RECENT'				=> 'Recent',
+	'PORTAL_RECENT_TOPIC'		=> 'Recente onderwerpen',
+	'PORTAL_RECENT_ANN'			=> 'Recente aankondigingen',
+	'PORTAL_RECENT_HOT_TOPIC'	=> 'Recente populaire onderwerpen',
+	// ACP
+	'ACP_PORTAL_RECENT_SETTINGS'			=> 'Recente onderwerpen instellingen',
+	'ACP_PORTAL_RECENT_SETTINGS_EXP'	=> 'Hier kan je het recente onderwerpen blok aanpassen.',
+	'PORTAL_MAX_TOPIC'						=> 'Limiet voor het aantal recente aankondigingen / actieve onderwerpen',
+	'PORTAL_MAX_TOPIC_EXP'				=> '0 betekend onbeperkt',
+	'PORTAL_RECENT_TITLE_LIMIT'				=> 'Limiet aantal tekens voor elk recent onderwerp',
+	'PORTAL_RECENT_TITLE_LIMIT_EXP'		=> '0 betekend onbeperkt',
+	'PORTAL_RECENT_FORUM'					=> 'Recent topics forums',
+	'PORTAL_RECENT_FORUM_EXP'			=> 'Forumonderdelen om de onderwerpen van weer te geven, laat dit leeg om alle forumonderdelen te gebruiken. Als "Forumonderdelen uitsluiten" is ingesteld op "Ja", selecteer dan de forumonderdelen die je wilt uitsluiten.<br />Als "Forumonderdelen uitsluiten" is ingesteld op "Nee" selecteer dan de forumonderdelen die je wilt weergeven.<br />Selecteer/Deselecteer meerdere forumonderdelen doormiddel van <samp>CTRL</samp> en door te klikken.',
+	'PORTAL_EXCLUDE_FORUM'					=> 'Forumonderdelen uitsluiten',
+	'PORTAL_EXCLUDE_FORUM_EXP'			=> 'Selecteer "Ja" als je de geselecteerde forumonderdelen wilt uitsluiuten van het recente onderwerpen blok, en "Nee" als je alleen de geselecteerde forumonderdelen wilt weergeven in het recente onderwerpen blok.',
+));

language/nl/modules/portal_search_module.php

@@ -0,0 +1,40 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Search
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_SEARCH'			=> 'Zoeken',
+	'PORTAL_SEARCH_GO'		=> 'Ga',
+	'PORTAL_SEARCH_SITE'	=> 'Forums',
+	'PORTAL_SEARCH_POSTS'	=> 'Berichten',
+	'PORTAL_SEARCH_AUTHOR'	=> 'Auteur',
+	'PORTAL_SEARCH_ENGINE'	=> 'Zoekmachines',
+	'PORTAL_SEARCH_ADV'		=> 'Uitgebreid zoeken',
+));

language/nl/modules/portal_statistics_module.php

@@ -0,0 +1,49 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Statistics
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'ST_TOP'		=> 'Aantallen',
+	'ST_TOP_ANNS'	=> 'Totaal Aankondigingen:',
+	'ST_TOP_STICKYS'=> 'Totaal Stickies:',
+	'ST_TOT_ATTACH'	=> 'Totaal Bijlagen:',
+	'TOPICS_PER_DAY_OTHER'	=> 'Onderwerpen per dag: <strong>%d</strong>',
+	'TOPICS_PER_DAY_ZERO'	=> 'Onderwerpen per dag: <strong>0</strong>',
+	'POSTS_PER_DAY_OTHER'	=> 'Berichten per dag: <strong>%d</strong>',
+	'POSTS_PER_DAY_ZERO'	=> 'Berichten per dag: <strong>0</strong>',
+	'USERS_PER_DAY_OTHER'	=> 'Gebruikers per dag: <strong>%d</strong>',
+	'USERS_PER_DAY_ZERO'	=> 'Gebruikers per dag: <strong>0</strong>',
+	'TOPICS_PER_USER_OTHER'	=> 'Onderwerpen per gebruiker: <strong>%d</strong>',
+	'TOPICS_PER_USER_ZERO'	=> 'Onderwerpen per gebruiker: <strong>0</strong>',
+	'POSTS_PER_USER_OTHER'	=> 'Berichten per gebruiker: <strong>%d</strong>',
+	'POSTS_PER_USER_ZERO'	=> 'Berichten per gebruiker: <strong>0</strong>',
+	'POSTS_PER_TOPIC_OTHER'	=> 'Berichten per onderwerp: <strong>%d</strong>',
+	'POSTS_PER_TOPIC_ZERO'	=> 'Berichten per onderwerp: <strong>0</strong>',
+));

language/nl/modules/portal_stylechanger_module.php

@@ -0,0 +1,35 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Stylechanger
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'BOARD_STYLE'			=> 'Forumstijl',
+	'STYLE_CHOOSE'			=> 'Selecteer een stijl',
+));

language/nl/modules/portal_topposters_module.php

@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Topposters
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'TOPPOSTERS'					=> 'Top berichtenauteurs',
+	'TOPPOSTERS_CONFIG'				=> 'Top berichtenauteurs instellingen',
+	// ACP
+	'NUM_TOPPOSTERS'				=> 'Aantal top berichtenauteurs',
+	'NUM_TOPPOSTERS_EXP'			=> 'Geef aan hoeveel gebruikers je wilt weergeven in het top berichtenauteurs blok.',
+));

language/nl/modules/portal_user_menu_module.php

@@ -0,0 +1,43 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - User Menu
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'USER_MENU'			=> 'Gebruikersmenu',
+	'UM_LOG_ME_IN'		=> 'Ondhoud me',
+	'UM_HIDE_ME'		=> 'Verberg me',
+	'UM_REGISTER_NOW'	=> 'Registreer nu!',
+	'UM_MAIN_SUBSCRIBED'=> 'Abonnementen',
+	'UM_BOOKMARKS'		=> 'Favorieten',
+	'M_MENU' 			=> 'Menu',
+	'M_ACP'				=> 'ACP',
+	'USER_MENU_SETTINGS'	=> 'Gebruikersmenu instellingen',
+	'USER_MENU_REGISTER'	=> 'Laat registratie link zien in gebruikersmenu',
+));

language/nl/modules/portal_welcome_module.php

@@ -0,0 +1,40 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Welcome
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_WELCOME'		=> 'Welkomsbericht',
+	// ACP
+	'ACP_PORTAL_WELCOME_SETTINGS'			=> 'Welkomsbericht instellingen',
+	'ACP_PORTAL_WELCOME_MESSAGE_SHORT'		=> 'Het bericht wat je hebt ingevoerd is niet lang genoeg.',
+	'ACP_PORTAL_WELCOME_PREVIEW'			=> 'Welkomsbericht voorbeeld',
+	'ACP_PORTAL_WELCOME_MESSAGE'			=> 'Welkomsbericht',
+	'ACP_PORTAL_WELCOME_MESSAGE_EXP'		=> 'Je kan het welkomsbericht veranderen in het tekstvak. BBCode, afbeeldingen en URLs zijn toegestaan.',
+));

language/nl/modules/portal_whois_online_module.php

@@ -0,0 +1,34 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1 - Who is online
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_WHOIS_ONLINE'			=> 'Wie is online?',
+));

language/nl/portal.php

@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+// Common
+$lang = array_merge($lang, array(
+	'PORTAL'					=> 'Portaal',
+	'VIEWING_PORTAL'			=> 'Portaalpagina',
+	'BACK'						=> 'Terug',
+	'B3P_WRONG_METHOD_CALL'		=> 'Onjuiste oproep naar methode %s',
+));

language/nl/portal_acp.php

@@ -0,0 +1,123 @@
+<?php
+/**
+*
+* [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
+* @package Board3 Portal v2.1
+* @copyright (c) 2014 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	// Portal Modules
+	'ACP_PORTAL_MODULES_EXP'		=> 'Je kan je portaalmodules hier beheren. Als je alle modules uitschakelt, schakel dan ook het portaal zelf uit.',
+	'MODULE_POS_TOP'				=> 'Boven',
+	'MODULE_POS_LEFT'				=> 'Linker kolom',
+	'MODULE_POS_RIGHT'				=> 'Rechter kolom',
+	'MODULE_POS_CENTER'				=> 'Midden kolom',
+	'MODULE_POS_BOTTOM'				=> 'Onder',
+	'ADD_MODULE'					=> 'Voeg module toe',
+	'CHOOSE_MODULE'					=> 'Kies een module',
+	'CHOOSE_MODULE_EXP'				=> 'Kies een module uit de drop-down lijst',
+	'SUCCESS_ADD'					=> 'De module is succesvol toegevoegd.',
+	'SUCCESS_DELETE'				=> 'De module is succesvol verwijderd.',
+	'NO_MODULES'					=> 'Er zijn geen modules gedetecteerd.',
+	'MOVE_RIGHT'					=> 'Verplaats naar rechts',
+	'MOVE_LEFT'						=> 'verplaats naar links',
+	'B3P_FILE_NOT_FOUND'			=> 'Het gevraagde bestand kan niet worden gevonden',
+	'UNABLE_TO_MOVE'				=> 'Het is niet mogelijk om het blok naar de geselecteerde kolom te verplaatsen.',
+	'UNABLE_TO_MOVE_ROW'			=> 'Het is niet mogelijk om het blok naar de geselecteerde rij te verplaatsen.',
+	'DELETE_MODULE_CONFIRM'			=> 'Weet je zeker dat je de module "%1$s" wilt verwijderen?',
+	'MODULE_RESET_SUCCESS'			=> 'Module instellingen succesvol gereset.',
+	'MODULE_RESET_CONFIRM'			=> 'Weet je zeker dat je de instellingen van de module "%1$s" wilt resetten?',
+	'MODULE_NOT_EXISTS'				=> 'De geselecteerde module bestaat niet.',
+	'MODULE_OPTIONS'			=> 'Module opties',
+	'MODULE_NAME'				=> 'Module naam',
+	'MODULE_NAME_EXP'			=> 'Vul hier de naam van de module in die moet worden weergegeven in de module configuratie.',
+	'MODULE_IMAGE'				=> 'Module-afbeelding',
+	'MODULE_IMAGE_EXP'			=> 'Vul hier de bestandsnaam in van de module afbeelding. Afbeeldingen moeten in alle styles/{jouwstijl}/theme/images/portal/ mappen staan',
+	'MODULE_PERMISSIONS'		=> 'Module permissies',
+	'MODULE_PERMISSIONS_EXP'	=> 'Selecteer de groepen die deze module mogen zien. Als alle groepen deze module mogen zien, selecteer dan niets.<br />Selecteer/Deselecteer meerdere groepen door middel van <samp>CTRL</samp> en door te klikken.',
+	'MODULE_IMAGE_WIDTH'		=> 'Module-afbeeldingsbreedte',
+	'MODULE_IMAGE_WIDTH_EXP'	=> 'Breedte module-afbeelding in pixels',
+	'MODULE_IMAGE_HEIGHT'		=> 'Module-afbeldingshoogte',
+	'MODULE_IMAGE_HEIGHT_EXP'	=> 'Hoogte module-afbeelding in pixels',
+	'MODULE_RESET'				=> 'Reset module configuratie',
+	'MODULE_RESET_EXP'			=> 'Hierdoor worden alle instellingen teruggezet naar de standaard configuratie!',
+	'MODULE_STATUS'				=> 'Module inschakelen',
+	'MODULE_ADD_ONCE'			=> 'Deze module kan maar één keer worden toegevoegd.',
+	'MODULE_IMAGE_ERROR'		=> 'Er is een fout opgetreden tijdens het controleren van de module afbeelding:',
+	'UNKNOWN_MODULE_METHOD'		=> 'De methode van de %1$s module kan niet worden gevonden.',
+	// general
+	'ACP_PORTAL_CONFIG_INFO'				=> 'Algemene instellingen',
+	'ACP_PORTAL_GENERAL_TITLE'				=> 'Portaal beheer',
+	'ACP_PORTAL_GENERAL_TITLE_EXP'			=> 'Dank je wel voor het kiezen van Board3 Portal! Dit is de plek waar jij je portaalpagina kan beheren. Onderstaande opties geven je de mogelijkheid verschillende algemene instellingen aan te passen.',
+	'PORTAL_ENABLE'							=> 'Portaal inschakelen',
+	'PORTAL_ENABLE_EXP'						=> 'Schakel het hele portaal in of uit',
+	'PORTAL_LEFT_COLUMN'					=> 'Linkerkolom inschakelen',
+	'PORTAL_LEFT_COLUMN_EXP'				=> 'Verander naar nee als je de linkerkolom wilt uitschakelen',
+	'PORTAL_RIGHT_COLUMN'					=> 'Rechterkolom inschakelen',
+	'PORTAL_RIGHT_COLUMN_EXP'				=> 'Verander naar nee als je de rechterkolom wilt uitschakelen',
+	'PORTAL_VERSION_CHECK'					=> 'Versiecontrole op portaalpagina',
+	'PORTAL_DISPLAY_JUMPBOX'				=> 'Jumpbox weergeven',
+	'PORTAL_DISPLAY_JUMPBOX_EXP'			=> 'Jumpbox op de portaalpagina weergeven. De jumpbox wordt alleen zichtbaar als je hem hebt ingeschakeld bij de forumfuncties.',
+	'ACP_PORTAL_COLUMN_WIDTH_SETTINGS'		=> 'Linker en rechterkolom breedte instellingen',
+	'PORTAL_LEFT_COLUMN_WIDTH'				=> 'Breedte van de linkerkolom',
+	'PORTAL_LEFT_COLUMN_WIDTH_EXP'			=> 'Verander de breedte van de linkerkolom in pixels; aanbevolen waarde is 180',
+	'PORTAL_RIGHT_COLUMN_WIDTH'				=> 'Breedte van de rechterkolom',
+	'PORTAL_RIGHT_COLUMN_WIDTH_EXP'			=> 'Verander de breedte van de rechterkolom in pixels; aanbevolen waarde is 180',
+	'LINK_ADDED'							=> 'De link is succesvol toegevoegd',
+	'LINK_UPDATED'							=> 'De link is succesvol gewijzigd',
+	// Upload Module
+	'MODULE_UPLOAD'					=> 'Een module uploaden',
+	'MODULE_UPLOAD_EXP'				=> 'Kies het ZIP-bestand van de module die je wilt uploaden:',
+	'MODULE_UPLOAD_GO'				=> 'Upload',
+	'NO_MODULE_UPLOAD'				=> 'Je server configuratie staat het uploaden van bestanden niet toe.',
+	'NO_FILE_B3P'					=> 'Geen zip-bestand gespecificeerd.',
+	'MODULE_UPLOADED'				=> 'Module succesvol geüpload.',
+	'MODULE_UPLOAD_MKDIR_FAILURE'	=> 'Niet instaat om een map aan te maken.',
+	'MODULE_COPY_FAILURE'			=> 'Niet instaat om de map: %1$s te kopiëren',
+	'MODULE_CORRUPTED'				=> 'De module die je probeert te uploaden lijkt corrupt te zijn.',
+	'PORTAL_NEW_FILES'				=> 'Nieuwe bestanden',
+	'PORTAL_MODULE_SOURCE'			=> 'Bron',
+	'PORTAL_MODULE_TARGET'			=> 'Doel',
+	'PORTAL_MODULE_STATUS'			=> 'Status',
+	'PORTAL_MODULE_SUCCESS'			=> 'Succes',
+	'PORTAL_MODULE_ERROR'			=> 'Fout',
+	// Install
+	'PORTAL_BASIC_INSTALL'			=> 'Basisset van modules toevoegen',
+	'PORTAL_BASIC_UNINSTALL'		=> 'Modules verwijderen uit de database',
+	/**
+	* A copy of Handyman` s MOD version check, to view it on the portal overview
+	*/
+	'ANNOUNCEMENT_TOPIC'	=> 'Release aankondiging',
+	'CURRENT_VERSION'		=> 'Huidige versie',
+	'DOWNLOAD_LATEST'		=> 'Download de laatste versie',
+	'LATEST_VERSION'		=> 'Laatste versie',
+	'NO_INFO'				=> 'De server voor de versie controle kan niet worden bereikt',
+	'NOT_UP_TO_DATE'		=> '%s is niet up-to-date',
+	'RELEASE_ANNOUNCEMENT'	=> 'Aankondigingsonderwerp',
+	'UP_TO_DATE'			=> '%s is up-to-date',
+	'VERSION_CHECK'			=> 'EXT Versie Controle',
+));

migrations/v210_beta1.php

@@ -72,6 +72,7 @@ class v210_beta1 extends \phpbb\db\migration\migration
 	public function update_data()
 	{
 		return array(
+			array('custom', array(array($this, 'clean_portal_data'))),
 			array('config.add', array('board3_portal_version', '2.1.0b1')),
 			array('config.add', array('board3_enable', 1)),
 			array('config.add', array('board3_left_column', 1)),
@@ -553,4 +554,27 @@ class v210_beta1 extends \phpbb\db\migration\migration
 
 		$this->portal_config[$config_name] = $config_value;
 	}
+
+	/**
+	 * Clean portal data upon fresh install from config table
+	 */
+	public function clean_portal_data()
+	{
+		// Only run if portal version is not beta 1 or doesn't exist
+		if (!isset($this->config['board3_portal_version']) || $this->config['board3_portal_version'] !== '2.1.0-b1')
+		{
+			foreach ($this->config as $key => $entry)
+			{
+				if (strpos($key, 'board3_porrtal_') === 0)
+				{
+					$this->config->delete($key);
+				}
+			}
+
+			// Make sure entries are removed from database
+			$sql = 'DELETE FROM ' . CONFIG_TABLE . '
+					WHERE config_name ' . $this->db->sql_like_expression('board3_portal_' . $this->db->get_any_char());
+			$this->db->sql_query($sql);
+		}
+	}
 }

migrations/v210_rc1.php

@@ -0,0 +1,43 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1
+* @copyright (c) 2014 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace board3\portal\migrations;
+
+class v210_rc1 extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array('\board3\portal\migrations\v210_beta1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.remove', array('board3_phpbb_menu')),
+			array('config.update', array('board3_portal_version', '2.1.0-rc1')),
+			array('custom', array(array($this, 'add_clock_setting'))),
+		);
+	}
+
+	/**
+	 * Adds clock settings to already installed clock modules
+	 */
+	public function add_clock_setting()
+	{
+		$sql = 'SELECT module_id
+			FROM ' . $this->table_prefix . "portal_modules
+			WHERE module_classname = '\\\board3\\\portal\\\modules\\\clock'";
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$this->config->set('board3_clock_src_' . $row['module_id'], '');
+		}
+		$this->db->sql_freeresult($result);
+	}
+}

modules/announcements.php

@@ -110,7 +110,7 @@ class announcements extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_center($module_id)
 	{
@@ -130,7 +130,7 @@ class announcements extends module_base
 			$this->config['board3_announcements_day_' . $module_id],
 			'announcements',
 			$start,
-			$this->config['board3_announcements_forum_exclude_' . $module_id]
+			(bool) $this->config['board3_announcements_forum_exclude_' . $module_id]
 		);
 
 		// Any announcements present? If not terminate it here.
@@ -231,7 +231,7 @@ class announcements extends module_base
 					// unread?
 					$forum_id = $fetch_news[$i]['forum_id'];
 					$topic_id = $fetch_news[$i]['topic_id'];
-					//$topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_id, $global_announce_list = false);
+
 					$unread_topic = (isset($topic_tracking_info[$topic_id]) && $fetch_news[$i]['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false;
 					$real_forum_id = ($forum_id == 0) ? $fetch_news['global_id']: $forum_id;
 					$read_full_url = ($this->request->is_set('ap')) ? 'ap='. $start . '&announcement=' . $i . '#a' . $i : 'announcement=' . $i . '#a' . $i;
@@ -243,7 +243,7 @@ class announcements extends module_base
 					}
 
 					$replies = ($this->auth->acl_get('m_approve', $forum_id)) ? $fetch_news[$i]['topic_replies_real'] : $fetch_news[$i]['topic_replies'];
-					$folder_img = $folder_alt = $topic_type = $folder = $folder_new = '';
+
 					switch ($fetch_news[$i]['topic_type'])
 					{
 						case POST_GLOBAL:
@@ -270,10 +270,7 @@ class announcements extends module_base
 						$folder .= '_locked';
 						$folder_new .= '_locked';
 					}
-					if ($fetch_news[$i]['topic_type'] == POST_GLOBAL)
-					{
-						$global_announce_list[$fetch_news[$i]['topic_id']] = true;
-					}
+
 					if ($fetch_news[$i]['topic_posted'])
 					{
 						$folder .= '_mine';
@@ -336,7 +333,7 @@ class announcements extends module_base
 					if ($this->config['board3_number_of_announcements_' . $module_id] != 0 && $this->config['board3_announcements_archive_' . $module_id])
 					{
 						$this->template->assign_vars(array(
-							'AP_PAGINATION'			=> $pagination,
+							'AP_PAGINATION'			=> (isset($pagination)) ? $pagination : '',
 							'TOTAL_ANNOUNCEMENTS'	=> ($total_announcements == 1) ? $this->user->lang['VIEW_LATEST_ANNOUNCEMENT'] : sprintf($this->user->lang['VIEW_LATEST_ANNOUNCEMENTS'], $total_announcements),
 							'AP_PAGE_NUMBER'		=> $this->pagination->on_page($total_announcements, $this->config['board3_number_of_announcements_' . $module_id], $start))
 						);
@@ -359,7 +356,7 @@ class announcements extends module_base
 
 				$forum_id = $fetch_news[$i]['forum_id'];
 				$topic_id = $fetch_news[$i]['topic_id'];
-				$topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_id, $global_announce_list = false);
+				$topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_id);
 				$unread_topic = (isset($topic_tracking_info[$topic_id]) && $fetch_news[$i]['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false;
 				$open_bracket = '[ ';
 				$close_bracket = ' ]';
@@ -412,7 +409,7 @@ class announcements extends module_base
 				if ($this->config['board3_number_of_announcements_' . $module_id] <> 0 && $this->config['board3_announcements_archive_' . $module_id])
 				{
 					$this->template->assign_vars(array(
-						'AP_PAGINATION'			=> $pagination,
+						'AP_PAGINATION'			=> (!empty($pagination)) ? $pagination : '',
 						'TOTAL_ANNOUNCEMENTS'	=> ($total_announcements == 1) ? $this->user->lang['VIEW_LATEST_ANNOUNCEMENT'] : sprintf($this->user->lang['VIEW_LATEST_ANNOUNCEMENTS'], $total_announcements),
 						'AP_PAGE_NUMBER'		=> $this->pagination->on_page($total_announcements, $this->config['board3_number_of_announcements_' . $module_id], $start))
 					);
@@ -445,7 +442,7 @@ class announcements extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{
@@ -467,7 +464,7 @@ class announcements extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function install($module_id)
 	{
@@ -485,7 +482,7 @@ class announcements extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function uninstall($module_id, $db)
 	{

modules/attachments.php

@@ -95,7 +95,7 @@ class attachments extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_center($module_id)
 	{
@@ -103,7 +103,7 @@ class attachments extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
@@ -111,7 +111,7 @@ class attachments extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{
@@ -130,7 +130,7 @@ class attachments extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function install($module_id)
 	{
@@ -144,7 +144,7 @@ class attachments extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function uninstall($module_id, $db)
 	{

modules/birthday_list.php

@@ -70,7 +70,7 @@ class birthday_list extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
@@ -158,7 +158,7 @@ class birthday_list extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{
@@ -172,7 +172,7 @@ class birthday_list extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function install($module_id)
 	{
@@ -181,7 +181,7 @@ class birthday_list extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function uninstall($module_id, $db)
 	{

modules/calendar.php

@@ -51,6 +51,7 @@ class calendar extends module_base
 	* additional variables
 	*/
 	protected $mini_cal_fdow;
+	protected $mini_cal_month;
 
 	/**
 	* User datetime object
@@ -143,7 +144,7 @@ class calendar extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
@@ -177,7 +178,6 @@ class calendar extends module_base
 		$mini_cal_count = $this->mini_cal_fdow;
 		$mini_cal_this_year = $this->dateYYYY;
 		$mini_cal_this_month = $this->dateMM;
-		$mini_cal_this_day = $this->dateDD;
 		$mini_cal_month_days = $this->daysMonth;
 
 		// output our general calendar bits
@@ -264,6 +264,7 @@ class calendar extends module_base
 
 		if (!empty($events) && $this->config['board3_display_events_' . $module_id])
 		{
+			$time_ary = array();
 			// we sort the $events array by the start time
 			foreach ($events as $key => $cur_event)
 			{
@@ -337,7 +338,7 @@ class calendar extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{
@@ -357,7 +358,7 @@ class calendar extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function install($module_id)
 	{
@@ -374,7 +375,7 @@ class calendar extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function uninstall($module_id, $db)
 	{
@@ -520,6 +521,7 @@ class calendar extends module_base
 					$this->log->add('admin', $this->user->data['user_id'], $this->user->data['user_ip'], 'LOG_PORTAL_EVENT_ADDED', false, array($event_title));
 				}
 
+				$time_ary = array();
 				// we sort the $events array by the start time
 				foreach ($events as $key => $cur_event)
 				{
@@ -601,8 +603,6 @@ class calendar extends module_base
 				$this->db->sql_freeresult($result);
 
 				return;
-
-			break;
 		}
 
 		for ($i = 0; $i < sizeof($events); $i++)
@@ -618,7 +618,7 @@ class calendar extends module_base
 				'EVENT_TITLE'	=> ($action != 'add') ? ((isset($this->user->lang[$events[$i]['title']])) ? $this->user->lang[$events[$i]['title']] : $events[$i]['title']) : '',
 				'EVENT_DESC'	=> ($action != 'add') ? $events[$i]['desc'] : '',
 				'EVENT_START'	=> ($action != 'add') ? $this->user->format_date($events[$i]['start_time'], $start_time_format) : '',
-				'EVENT_END'		=> ($action != 'add' && !$event_all_day) ? $this->user->format_date($events[$i]['end_time'], $end_time_format) : '',
+				'EVENT_END'		=> ($action != 'add' && !$event_all_day && !empty($end_time_format)) ? $this->user->format_date($events[$i]['end_time'], $end_time_format) : '',
 				'EVENT_URL'		=> ($action != 'add' && isset($events[$i]['url']) && !empty($events[$i]['url'])) ? $this->validate_url($events[$i]['url']) : '',
 				'EVENT_URL_RAW'	=> ($action != 'add' && isset($events[$i]['url']) && !empty($events[$i]['url'])) ? $events[$i]['url'] : '',
 				'U_EDIT'		=> $u_action . '&amp;action=edit&amp;id=' . $i,

modules/clock.php

@@ -41,22 +41,65 @@ class clock extends module_base
 	*/
 	public $language = 'portal_clock_module';
 
+	/** @var \phpbb\config\config */
+	protected $config;
+
+	/** @var \phpbb\template\template */
+	protected $template;
+
 	/**
-	* @inheritdoc
+	 * Constructor for clock module
+	 *
+	 * @param \phpbb\config\config $config phpBB config
+	 * @param \phpbb\template\template $template phpBB template
+	 */
+	public function __construct($config, $template)
+	{
+		$this->config = $config;
+		$this->template = $template;
+	}
+
+	/**
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
+		if (isset($this->config['board3_clock_src_' . $module_id]) && !empty($this->config['board3_clock_src_' . $module_id]))
+		{
+			$this->template->assign_var('B3P_CLOCK_SRC', $this->config['board3_clock_src_' . $module_id]);
+		}
 		return 'clock_side.html';
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{
 		return array(
 			'title'	=> 'ACP_PORTAL_CLOCK_SETTINGS',
-			'vars'	=> array(),
+			'vars'	=> array(
+				'legend1'	=> 'ACP_PORTAL_CLOCK_SETTINGS',
+				'board3_clock_src_' . $module_id	=> array('lang' => 'ACP_PORTAL_CLOCK_SRC', 'validate' => 'string', 'type' => 'text:50:200', 'explain' => true, 'submit_type' => 'custom', 'submit' => 'check_file_src'),
+			),
 		);
 	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function install($module_id)
+	{
+		$this->config->set('board3_clock_src_' . $module_id, '');
+		return true;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function uninstall($module_id, $db)
+	{
+		$this->config->delete('board3_clock_src_' . $module_id);
+		return true;
+	}
 }

modules/custom.php

@@ -96,7 +96,7 @@ class custom extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_center($module_id)
 	{
@@ -104,7 +104,7 @@ class custom extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
@@ -112,7 +112,7 @@ class custom extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{
@@ -126,7 +126,7 @@ class custom extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function install($module_id)
 	{
@@ -142,7 +142,7 @@ class custom extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function uninstall($module_id, $db)
 	{
@@ -186,7 +186,7 @@ class custom extends module_base
 
 		$u_action = append_sid('index.' . $this->php_ext, 'i=\board3\portal\acp\portal_module&mode=config&module_id=' . $module_id);
 
-		switch($action)
+		switch ($action)
 		{
 			// Save changes
 			case 'save':
@@ -202,14 +202,14 @@ class custom extends module_base
 				$custom_image_src = $this->request->variable('module_image', '', true);
 				$groups_ary = array();
 				$uid = $bitfield = $flags = '';
-				$options = 7;
-				if($custom_bbcode)
+
+				if ($custom_bbcode)
 				{
 					generate_text_for_storage($custom_code, $uid, $bitfield, $flags, true, true, true);
 				}
 
 				// first check for obvious errors, we don't want to waste server resources
-				if(empty($custom_code))
+				if (empty($custom_code))
 				{
 					trigger_error($this->user->lang['ACP_PORTAL_CUSTOM_CODE_SHORT']. adm_back_link($u_action), E_USER_WARNING);
 				}
@@ -219,7 +219,7 @@ class custom extends module_base
 						FROM ' . GROUPS_TABLE . '
 						ORDER BY group_id ASC';
 				$result = $this->db->sql_query($sql);
-				while($row = $this->db->sql_fetchrow($result))
+				while ($row = $this->db->sql_fetchrow($result))
 				{
 					$groups_ary[] = $row['group_id'];
 				}
@@ -261,12 +261,12 @@ class custom extends module_base
 				$groups_ary = array();
 
 				// first check for obvious errors, we don't want to waste server resources
-				if(empty($custom_code))
+				if (empty($custom_code))
 				{
 					trigger_error($this->user->lang['ACP_PORTAL_CUSTOM_CODE_SHORT']. adm_back_link($u_action), E_USER_WARNING);
 				}
 
-				if($custom_bbcode)
+				if ($custom_bbcode)
 				{
 					$bbcode_options = OPTION_FLAG_BBCODE + OPTION_FLAG_SMILIES + OPTION_FLAG_LINKS;
 					$uid  =  (isset($this->config['board3_custom_' . $module_id . '_uid'])) ? $this->config['board3_custom_' . $module_id . '_uid'] : '';
@@ -291,7 +291,7 @@ class custom extends module_base
 						FROM ' . GROUPS_TABLE . '
 						ORDER BY group_id ASC';
 				$result = $this->db->sql_query($sql);
-				while($row = $this->db->sql_fetchrow($result))
+				while ($row = $this->db->sql_fetchrow($result))
 				{
 					$groups_ary[] = $row['group_id'];
 				}
@@ -302,7 +302,7 @@ class custom extends module_base
 			// Edit or add menu item
 			case 'reset':
 			default:
-				if(!isset($custom_code))
+				if (!isset($custom_code))
 				{
 					$custom_code = generate_text_for_edit($portal_config['board3_custom_' . $module_id . '_code'], $this->config['board3_custom_' . $module_id . '_uid'], '');
 				}
@@ -328,7 +328,7 @@ class custom extends module_base
 						FROM ' . GROUPS_TABLE . '
 						ORDER BY group_id ASC';
 				$result = $this->db->sql_query($sql);
-				while($row = $this->db->sql_fetchrow($result))
+				while ($row = $this->db->sql_fetchrow($result))
 				{
 					$this->template->assign_block_vars('permission_setting', array(
 						'SELECTED'		=> (in_array($row['group_id'], $groups_ary)) ? true : false,
@@ -338,7 +338,7 @@ class custom extends module_base
 				}
 				$this->db->sql_freeresult($result);
 
-				if(!function_exists('display_forums'))
+				if (!function_exists('display_forums'))
 				{
 					include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
 				}
@@ -396,7 +396,7 @@ class custom extends module_base
 
 		$title = (!empty($this->config['board3_custom_' . $module_id . '_title'])) ? ((isset($this->user->lang[$this->config['board3_custom_' . $module_id . '_title']])) ? $this->user->lang[$this->config['board3_custom_' . $module_id . '_title']] : $this->config['board3_custom_' . $module_id . '_title']) : $this->user->lang[$this->name];
 
-		if(!empty($assign_code))
+		if (!empty($assign_code))
 		{
 			return array(
 				'template'	=> 'custom_' . $type . '.html',

modules/default.php

@@ -71,7 +71,7 @@ class modulename extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_center($module_id)
 	{
@@ -83,7 +83,7 @@ class modulename extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
@@ -95,7 +95,7 @@ class modulename extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{
@@ -110,7 +110,7 @@ class modulename extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function install($module_id)
 	{
@@ -120,7 +120,7 @@ class modulename extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function uninstall($module_id, $db)
 	{

modules/donation.php

@@ -65,7 +65,7 @@ class donation extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_center($module_id)
 	{
@@ -78,7 +78,7 @@ class donation extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
@@ -91,7 +91,7 @@ class donation extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{
@@ -106,7 +106,7 @@ class donation extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function install($module_id)
 	{
@@ -116,7 +116,7 @@ class donation extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function uninstall($module_id, $db)
 	{

modules/forumlist.php

@@ -86,7 +86,7 @@ class forumlist extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_center($module_id)
 	{
@@ -109,7 +109,7 @@ class forumlist extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{

modules/friends.php

@@ -75,7 +75,7 @@ class friends extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
@@ -131,7 +131,7 @@ class friends extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{
@@ -145,7 +145,7 @@ class friends extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function install($module_id)
 	{
@@ -154,7 +154,7 @@ class friends extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function uninstall($module_id, $db)
 	{

modules/latest_bots.php

@@ -75,7 +75,7 @@ class latest_bots extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
@@ -106,7 +106,7 @@ class latest_bots extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{
@@ -120,7 +120,7 @@ class latest_bots extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function install($module_id)
 	{
@@ -129,7 +129,7 @@ class latest_bots extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function uninstall($module_id, $db)
 	{

modules/latest_members.php

@@ -70,7 +70,7 @@ class latest_members extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
@@ -94,7 +94,7 @@ class latest_members extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{
@@ -108,7 +108,7 @@ class latest_members extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function install($module_id)
 	{
@@ -117,7 +117,7 @@ class latest_members extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function uninstall($module_id, $db)
 	{

modules/leaders.php

@@ -85,7 +85,7 @@ class leaders extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
@@ -213,6 +213,10 @@ class leaders extends module_base
 				{
 					$which_row = 'b3p_moderators';
 				}
+				else
+				{
+					continue;
+				}
 
 				if ($row['group_type'] == GROUP_HIDDEN && !$this->auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel') && $row['ug_user_id'] != $this->user->data['user_id'])
 				{
@@ -244,7 +248,7 @@ class leaders extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{
@@ -258,7 +262,7 @@ class leaders extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function install($module_id)
 	{
@@ -268,7 +272,7 @@ class leaders extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function uninstall($module_id, $db)
 	{

modules/link_us.php

@@ -65,7 +65,7 @@ class link_us extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
@@ -82,7 +82,7 @@ class link_us extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{

modules/links.php

@@ -102,11 +102,10 @@ class links extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
-		$links = array();
 		$portal_config = obtain_portal_config();
 
 		$links = $this->utf_unserialize($portal_config['board3_links_array_' . $module_id]);
@@ -116,7 +115,7 @@ class links extends module_base
 
 		for ($i = 0; $i < sizeof($links); $i++)
 		{
-			if($links[$i]['type'] == self::LINK_INT)
+			if ($links[$i]['type'] == self::LINK_INT)
 			{
 				$links[$i]['url'] = str_replace('&', '&amp;', $links[$i]['url']); // we need to do this in order to prevent XHTML validation errors
 				$cur_url = append_sid($this->phpbb_root_path . $links[$i]['url']); // the user should know what kind of file it is
@@ -129,7 +128,7 @@ class links extends module_base
 			$cur_permissions = explode(',', $links[$i]['permission']);
 			$permission_check = array_intersect($groups_ary, $cur_permissions);
 
-			if(!empty($permission_check) || $links[$i]['permission'] == '')
+			if (!empty($permission_check) || $links[$i]['permission'] == '')
 			{
 				$this->template->assign_block_vars('portallinks', array(
 					'LINK_TITLE'		=> (isset($this->user->lang[$links[$i]['title']])) ? $this->user->lang[$links[$i]['title']] : $links[$i]['title'],
@@ -144,7 +143,7 @@ class links extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{
@@ -160,7 +159,7 @@ class links extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function install($module_id)
 	{
@@ -186,7 +185,7 @@ class links extends module_base
 			'',
 		);
 
-		foreach($links_urls as $i => $url)
+		foreach ($links_urls as $i => $url)
 		{
 			$links[] = array(
 				'title' 		=> $links_titles[$i],
@@ -205,7 +204,7 @@ class links extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function uninstall($module_id, $db)
 	{
@@ -243,8 +242,6 @@ class links extends module_base
 		$link_id = $this->request->variable('id', 99999999); // 0 will trigger unwanted behavior, therefore we set a number we should never reach
 		$portal_config = obtain_portal_config();
 
-		$links = array();
-
 		$links = $this->utf_unserialize($portal_config['board3_links_array_' . $module_id]);
 
 		$u_action = append_sid('index.' . $this->php_ext, 'i=\board3\portal\acp\portal_module&amp;mode=config&amp;module_id=' . $module_id);
@@ -270,7 +267,7 @@ class links extends module_base
 						FROM ' . GROUPS_TABLE . '
 						ORDER BY group_id ASC';
 				$result = $this->db->sql_query($sql);
-				while($row = $this->db->sql_fetchrow($result))
+				while ($row = $this->db->sql_fetchrow($result))
 				{
 					$groups_ary[] = $row['group_id'];
 				}
@@ -407,11 +404,9 @@ class links extends module_base
 					'LINK_TITLE'	=> (isset($links[$link_id]['title']) && $action != 'add') ? $links[$link_id]['title'] : '',
 					'LINK_URL'		=> (isset($links[$link_id]['url']) && $action != 'add') ? str_replace('&', '&amp;', $links[$link_id]['url']) : '',
 
-					//'U_BACK'	=> $u_action,
-					'U_ACTION'	=> $u_action . '&amp;id=' . $link_id,
-
 					'S_EDIT'				=> true,
 					'S_LINK_IS_INT'			=> (isset($links[$link_id]['type']) && $links[$link_id]['type'] == self::LINK_INT) ? true : false,
+					'LINK_ID'		=> $link_id,
 				));
 
 				$groups_ary = (isset($links[$link_id]['permission'])) ? explode(',', $links[$link_id]['permission']) : array();
@@ -421,7 +416,7 @@ class links extends module_base
 						FROM ' . GROUPS_TABLE . '
 						ORDER BY group_id ASC';
 				$result = $this->db->sql_query($sql);
-				while($row = $this->db->sql_fetchrow($result))
+				while ($row = $this->db->sql_fetchrow($result))
 				{
 					$this->template->assign_block_vars('permission_setting_link', array(
 						'SELECTED'		=> (in_array($row['group_id'], $groups_ary)) ? true : false,
@@ -432,8 +427,6 @@ class links extends module_base
 				$this->db->sql_freeresult($result);
 
 				return;
-
-			break;
 		}
 
 		for ($i = 0; $i < sizeof($links); $i++)

modules/main_menu.php

@@ -103,11 +103,10 @@ class main_menu extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
-		$links = array();
 		$portal_config = obtain_portal_config();
 
 		$links = $this->utf_unserialize($portal_config['board3_menu_array_' . $module_id]);
@@ -117,7 +116,7 @@ class main_menu extends module_base
 
 		for ($i = 0; $i < sizeof($links); $i++)
 		{
-			if($links[$i]['type'] == self::LINK_CAT)
+			if ($links[$i]['type'] == self::LINK_CAT)
 			{
 				$this->template->assign_block_vars('portalmenu', array(
 					'CAT_TITLE'		=> (isset($this->user->lang[$links[$i]['title']])) ? $this->user->lang[$links[$i]['title']] : $links[$i]['title'],
@@ -126,7 +125,7 @@ class main_menu extends module_base
 			}
 			else
 			{
-				if($links[$i]['type'] == self::LINK_INT)
+				if ($links[$i]['type'] == self::LINK_INT)
 				{
 					$links[$i]['url'] = str_replace('&', '&amp;', $links[$i]['url']); // we need to do this in order to prevent XHTML validation errors
 					$cur_url = append_sid($this->phpbb_root_path . $links[$i]['url']); // the user should know what kind of file it is
@@ -139,7 +138,7 @@ class main_menu extends module_base
 				$cur_permissions = explode(',', $links[$i]['permission']);
 				$permission_check = array_intersect($groups_ary, $cur_permissions);
 
-				if(!empty($permission_check) || $links[$i]['permission'] == '')
+				if (!empty($permission_check) || $links[$i]['permission'] == '')
 				{
 					$this->template->assign_block_vars('portalmenu.links', array(
 						'LINK_TITLE'		=> (isset($this->user->lang[$links[$i]['title']])) ? $this->user->lang[$links[$i]['title']] : $links[$i]['title'],
@@ -154,7 +153,7 @@ class main_menu extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{
@@ -169,16 +168,17 @@ class main_menu extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function install($module_id)
 	{
 		// get the correct group IDs from the database
 		$in_ary = array('GUESTS', 'REGISTERED', 'REGISTERED_COPPA');
+		$groups_ary = array();
 
 		$sql = 'SELECT group_id, group_name FROM ' . GROUPS_TABLE . ' WHERE ' . $this->db->sql_in_set('group_name', $in_ary);
 		$result = $this->db->sql_query($sql);
-		while($row = $this->db->sql_fetchrow($result))
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$groups_ary[$row['group_name']] = $row['group_id'];
 		}
@@ -241,7 +241,7 @@ class main_menu extends module_base
 			'',
 		);
 
-		foreach($links_urls as $i => $url)
+		foreach ($links_urls as $i => $url)
 		{
 			$links[] = array(
 				'title' 		=> $links_titles[$i],
@@ -260,7 +260,7 @@ class main_menu extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function uninstall($module_id, $db)
 	{
@@ -298,8 +298,6 @@ class main_menu extends module_base
 		$link_id = $this->request->variable('id', 99999999); // 0 will trigger unwanted behavior, therefore we set a number we should never reach
 		$portal_config = obtain_portal_config();
 
-		$links = array();
-
 		$links = $this->utf_unserialize($portal_config['board3_menu_array_' . $module_id]);
 
 		$u_action = append_sid('index.' . $this->php_ext, 'i=%5Cboard3%5Cportal%5Cacp%5Cportal_module&amp;mode=config&amp;module_id=' . $module_id);
@@ -326,7 +324,7 @@ class main_menu extends module_base
 						FROM ' . GROUPS_TABLE . '
 						ORDER BY group_id ASC';
 				$result = $this->db->sql_query($sql);
-				while($row = $this->db->sql_fetchrow($result))
+				while ($row = $this->db->sql_fetchrow($result))
 				{
 					$groups_ary[] = $row['group_id'];
 				}
@@ -467,8 +465,7 @@ class main_menu extends module_base
 					'LINK_TITLE'	=> (isset($links[$link_id]['title']) && $action != 'add') ? $links[$link_id]['title'] : '',
 					'LINK_URL'		=> (isset($links[$link_id]['url']) && $links[$link_id]['type'] != self::LINK_CAT && $action != 'add') ? str_replace('&', '&amp;', $links[$link_id]['url']) : '',
 
-					//'U_BACK'	=> $u_action,
-					'U_ACTION'	=> $u_action . '&amp;id=' . $link_id,
+					'LINK_ID'		=> $link_id,
 
 					'S_EDIT'				=> true,
 					'S_LINK_IS_CAT'			=> (!isset($links[$link_id]['type']) || $links[$link_id]['type'] == self::LINK_CAT) ? true : false,
@@ -482,7 +479,7 @@ class main_menu extends module_base
 						FROM ' . GROUPS_TABLE . '
 						ORDER BY group_id ASC';
 				$result = $this->db->sql_query($sql);
-				while($row = $this->db->sql_fetchrow($result))
+				while ($row = $this->db->sql_fetchrow($result))
 				{
 					$this->template->assign_block_vars('permission_setting_menu', array(
 						'SELECTED'		=> (in_array($row['group_id'], $groups_ary)) ? true : false,
@@ -493,8 +490,6 @@ class main_menu extends module_base
 				$this->db->sql_freeresult($result);
 
 				return;
-
-			break;
 		}
 
 		for ($i = 0; $i < sizeof($links); $i++)

modules/module_base.php

@@ -14,8 +14,20 @@ namespace board3\portal\modules;
 */
 class module_base implements module_interface
 {
+	/** @var int Module's allowed columns */
+	protected $columns;
+
+	/** @var string Module name */
+	protected $name;
+
+	/** @var string Module image source */
+	protected $image_src;
+
+	/** @var string Module language file */
+	protected $language;
+
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_allowed_columns()
 	{
@@ -23,7 +35,7 @@ class module_base implements module_interface
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_name()
 	{
@@ -31,7 +43,7 @@ class module_base implements module_interface
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_image()
 	{
@@ -39,7 +51,7 @@ class module_base implements module_interface
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_language()
 	{
@@ -47,7 +59,7 @@ class module_base implements module_interface
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
@@ -55,7 +67,7 @@ class module_base implements module_interface
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_center($module_id)
 	{
@@ -63,15 +75,15 @@ class module_base implements module_interface
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{
-		return false;
+		return array();
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function install($module_id)
 	{
@@ -79,7 +91,7 @@ class module_base implements module_interface
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function uninstall($module_id, $db)
 	{

modules/module_interface.php

@@ -47,7 +47,9 @@ interface module_interface
 	* File must be in "board3/portal/language/{$user->lang}/portal/" or
 	* this should return false.
 	*
-	* @return string|bool Language file or false
+	* @return string|bool|array	Language file, array of vendor and language file
+	*		or false. Array has to match this format:
+	*		array('vendor' => 'foo', 'file' => 'bar')
 	*/
 	public function get_language();
 
@@ -56,7 +58,7 @@ interface module_interface
 	*
 	* @param int $module_id Module's ID
 	*
-	* @return string Module template file
+	* @return string|array Module template file
 	*/
 	public function get_template_side($module_id);
 
@@ -65,7 +67,7 @@ interface module_interface
 	*
 	* @param int $module_id Module's ID
 	*
-	* @return string Module template file
+	* @return string|array Module template file
 	*/
 	public function get_template_center($module_id);
 

modules/news.php

@@ -110,7 +110,7 @@ class news extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_center($module_id)
 	{
@@ -119,6 +119,7 @@ class news extends module_base
 		$this->user->add_lang('viewforum');
 		$start = $this->request->variable('np', 0);
 		$start = ($start < 0) ? 0 : $start;
+		$total_news = 1;
 
 		// Fetch news from portal functions.php with check if "read full" is requested.
 		$portal_news_length = ($news < 0) ? $this->config['board3_news_length_' . $module_id] : 0;
@@ -131,7 +132,7 @@ class news extends module_base
 			0,
 			($this->config['board3_show_all_news_' . $module_id]) ? 'news_all' : 'news',
 			$start,
-			$this->config['board3_news_exclude_' . $module_id]
+			(bool) $this->config['board3_news_exclude_' . $module_id]
 		);
 
 		// Any news present? If not terminate it here.
@@ -234,7 +235,7 @@ class news extends module_base
 					}
 
 					$replies = ($this->auth->acl_get('m_approve', $forum_id)) ? $fetch_news[$i]['topic_replies_real'] : $fetch_news[$i]['topic_replies'];
-					$folder_img = $folder_alt = $topic_type = $folder = $folder_new = '';
+
 					switch ($fetch_news[$i]['topic_type'])
 					{
 						case POST_STICKY:
@@ -325,7 +326,7 @@ class news extends module_base
 					if ($this->config['board3_number_of_news_' . $module_id] <> 0 && $this->config['board3_news_archive_' . $module_id])
 					{
 						$this->template->assign_vars(array(
-							'NP_PAGINATION'		=> $pagination,
+							'NP_PAGINATION'		=> (!empty($pagination)) ? $pagination : '',
 							'TOTAL_NEWS'		=> ($total_news == 1) ? sprintf($this->user->lang['VIEW_FORUM_TOPICS'][1], $total_news) : sprintf($this->user->lang['VIEW_FORUM_TOPICS'][2], $total_news),
 							'NP_PAGE_NUMBER'	=> $this->pagination->on_page($total_news, $this->config['board3_number_of_news_' . $module_id], $start))
 						);
@@ -389,7 +390,7 @@ class news extends module_base
 				if ($this->config['board3_number_of_news_' . $module_id] <> 0 && $this->config['board3_news_archive_' . $module_id])
 				{
 					$this->template->assign_vars(array(
-						'NP_PAGINATION'		=> $pagination,
+						'NP_PAGINATION'		=> (!empty($pagination)) ? $pagination : '',
 						'TOTAL_NEWS'		=> ($total_news == 1) ? $this->user->lang['VIEW_FORUM_TOPIC'] : $this->user->lang('VIEW_FORUM_TOPICS', $total_news),
 						'NP_PAGE_NUMBER'	=> $this->pagination->on_page($total_news, $this->config['board3_number_of_news_' . $module_id], $start))
 					);
@@ -424,7 +425,7 @@ class news extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{
@@ -447,7 +448,7 @@ class news extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function install($module_id)
 	{
@@ -465,7 +466,7 @@ class news extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function uninstall($module_id, $db)
 	{

modules/poll.php

@@ -22,7 +22,7 @@ class poll extends module_base
 	* right		8
 	* bottom	16
 	*/
-	public $columns = 21;
+	public $columns = 31;
 
 	/**
 	* Default modulename
@@ -96,7 +96,7 @@ class poll extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_center($module_id)
 	{
@@ -104,7 +104,7 @@ class poll extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
@@ -112,7 +112,7 @@ class poll extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{
@@ -130,7 +130,7 @@ class poll extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function install($module_id)
 	{
@@ -143,7 +143,7 @@ class poll extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function uninstall($module_id, $db)
 	{
@@ -209,7 +209,7 @@ class poll extends module_base
 				// Cookie based guest tracking ... I don't like this but hum ho
 				// it's oft requested. This relies on "nice" users who don't feel
 				// the need to delete cookies to mess with results.
-				if ($request->is_set($this->config['cookie_name'] . '_poll_' . $up_topic_id, \phpbb\request\request_interface::COOKIE))
+				if ($this->request->is_set($this->config['cookie_name'] . '_poll_' . $up_topic_id, \phpbb\request\request_interface::COOKIE))
 				{
 					$cur_voted_id = explode(',', $this->request->variable($this->config['cookie_name'] . '_poll_' . $up_topic_id, '', true, \phpbb\request\request_interface::COOKIE));
 					$cur_voted_id = array_map('intval', $cur_voted_id);
@@ -317,12 +317,9 @@ class poll extends module_base
 			}
 		}
 
-		$where = '';
 		$poll_forums = false;
 
 		// Get readable forums
-		$forum_list = array();
-
 		$forum_list = array_unique(array_keys($this->auth->acl_getf('f_read', true)));
 
 		if($this->config['board3_poll_topic_id_' . $module_id] !== '')

modules/random_member.php

@@ -71,7 +71,7 @@ class random_member extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
@@ -108,7 +108,7 @@ class random_member extends module_base
 
 		$avatar_img = phpbb_get_avatar(\phpbb\avatar\manager::clean_row($row, 'user'), 'USER_AVATAR');
 
-		$rank_title = $rank_img = '';
+		$rank_title = $rank_img = $rank_img_src = '';
 		get_user_rank($row['user_rank'], $row['user_posts'], $rank_title, $rank_img, $rank_img_src);
 
 		$username = $row['username'];
@@ -138,7 +138,7 @@ class random_member extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{

modules/recent.php

@@ -91,7 +91,7 @@ class recent extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_center($module_id)
 	{
@@ -209,7 +209,7 @@ class recent extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{
@@ -226,7 +226,7 @@ class recent extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function install($module_id)
 	{
@@ -238,7 +238,7 @@ class recent extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function uninstall($module_id, $db)
 	{

modules/search.php

@@ -71,7 +71,7 @@ class search extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
@@ -81,7 +81,7 @@ class search extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{

modules/statistics.php

@@ -81,7 +81,7 @@ class statistics extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
@@ -166,7 +166,7 @@ class statistics extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{

modules/stylechanger.php

@@ -85,7 +85,7 @@ class stylechanger extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
@@ -125,7 +125,7 @@ class stylechanger extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{

modules/topposters.php

@@ -75,7 +75,7 @@ class topposters extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
@@ -101,7 +101,7 @@ class topposters extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{
@@ -115,7 +115,7 @@ class topposters extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function install($module_id)
 	{
@@ -124,7 +124,7 @@ class topposters extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function uninstall($module_id, $db)
 	{

modules/user_menu.php

@@ -95,7 +95,7 @@ class user_menu extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
@@ -113,7 +113,6 @@ class user_menu extends module_base
 
 			if ($this->auth->acl_get('m_approve'))
 			{
-				$m_approve_fid_ary = array(-1);
 				$m_approve_fid_sql = '';
 			}
 			else if ($this->auth->acl_getf_global('m_approve'))
@@ -123,7 +122,6 @@ class user_menu extends module_base
 			}
 			else
 			{
-				$m_approve_fid_ary = array();
 				$m_approve_fid_sql = ' AND p.post_visibility = 1';
 			}
 
@@ -141,7 +139,6 @@ class user_menu extends module_base
 			$sql_where = 'AND t.topic_moved_id = 0
 							' . str_replace(array('p.', 'post_'), array('t.', 'topic_'), $m_approve_fid_sql) . '
 							' . ((sizeof($ex_fid_ary)) ? 'AND ' . $this->db->sql_in_set('t.forum_id', $ex_fid_ary, true) : '');
-			$unread_list = array();
 			$unread_list = get_unread_topics($this->user->data['user_id'], $sql_where, 'ORDER BY t.topic_id DESC');
 			$unread_posts_count = sizeof($unread_list);
 
@@ -150,7 +147,7 @@ class user_menu extends module_base
 			$username = $this->user->data['username'];
 			$colour = $this->user->data['user_colour'];
 			$avatar_img = phpbb_get_avatar(\phpbb\avatar\manager::clean_row($this->user->data, 'user'), 'USER_AVATAR');
-			$rank_title = $rank_img = '';
+			$rank_title = $rank_img = $rank_img_src = '';
 			\get_user_rank($this->user->data['user_rank'], $this->user->data['user_posts'], $rank_title, $rank_img, $rank_img_src);
 
 			// Assign specific vars
@@ -198,7 +195,7 @@ class user_menu extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{
@@ -212,7 +209,7 @@ class user_menu extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function install($module_id)
 	{
@@ -222,7 +219,7 @@ class user_menu extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function uninstall($module_id, $db)
 	{

modules/welcome.php

@@ -86,7 +86,7 @@ class welcome extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_center($module_id)
 	{
@@ -106,7 +106,7 @@ class welcome extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{
@@ -120,7 +120,7 @@ class welcome extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function install($module_id)
 	{
@@ -132,7 +132,7 @@ class welcome extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function uninstall($module_id, $db)
 	{
@@ -184,7 +184,6 @@ class welcome extends module_base
 
 				$welcome_message = $this->request->variable('welcome_message', '', true);
 				$uid = $bitfield = $flags = '';
-				$options = 7;
 				generate_text_for_storage($welcome_message, $uid, $bitfield, $flags, true, true, true);
 
 				// first check for obvious errors, we don't want to waste server resources

modules/whois_online.php

@@ -86,7 +86,7 @@ class whois_online extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_center($module_id)
 	{
@@ -139,7 +139,7 @@ class whois_online extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_side($module_id)
 	{
@@ -147,7 +147,7 @@ class whois_online extends module_base
 	}
 
 	/**
-	* @inheritdoc
+	* {@inheritdoc}
 	*/
 	public function get_template_acp($module_id)
 	{

portal/fetch_posts.php

@@ -440,7 +440,7 @@ class fetch_posts
 	*/
 	protected function set_forum_constraints($forum_from, $disallowed_forums, $invert = false)
 	{
-		if ($invert == true)
+		if ($invert == true || empty($forum_from))
 		{
 			$access_list = array_merge($disallowed_forums, $forum_from);
 			$sql_operator = '<>';

styles/prosilver/template/event/overall_footer_breadcrumb_prepend.html

@@ -1 +1 @@
-<span class="crumb"><a href="{U_PORTAL}" data-navbar-reference="portal">{L_PORTAL}</a></span>
+<!-- IF U_PORTAL --><span class="crumb"><a href="{U_PORTAL}" data-navbar-reference="portal">{L_PORTAL}</a></span><!-- ENDIF -->

styles/prosilver/template/event/overall_header_breadcrumb_prepend.html

@@ -1 +1 @@
-<span class="crumb"><a href="{U_PORTAL}" data-navbar-reference="portal">{L_PORTAL}</a></span>
+<!-- IF U_PORTAL --><span class="crumb"><a href="{U_PORTAL}" data-navbar-reference="portal">{L_PORTAL}</a></span><!-- ENDIF -->

styles/prosilver/template/event/overall_header_head_append.html

@@ -1,4 +1,4 @@
 <!-- IF T_EXT_THEME_PATH -->
 <!-- INCLUDECSS ../theme/portal.css -->
-<link href="{T_EXT_THEME_PATH}responsive.css" rel="stylesheet" type="text/css" media="only screen and (max-width: 1040px), only screen and (max-device-width: 1040px)" />
+<!-- INCLUDECSS ../theme/portal_responsive.css -->
 <!-- ENDIF -->

styles/prosilver/template/portal/_block_config.html

@@ -1,6 +1,6 @@
 <!-- Config for the left and right blocks //-->
 <!-- DEFINE $LR_BLOCK_H_L = '<div class="forabg"><div class="inner"><ul class="topiclist"><li class="header"><dl><dt style="padding: 0px 0px 2px; white-space: nowrap; margin-bottom: 0px; margin-top: 0px;">' -->
-<!-- DEFINE $LR_BLOCK_H_R = '</dt><dd></dd></dl></li></ul><ul class="topiclist forums"><li><dl><dt></dt><dd style="border-left: 0px; width: 100%;"><div style="text-align: left; margin: 5px 5px 5px 5px">' -->
+<!-- DEFINE $LR_BLOCK_H_R = '</dt><dd></dd></dl></li></ul><ul class="topiclist forums"><li><dl><dt></dt><dd class="portal-side-wrapper"><div class="portal-side">' -->
 <!-- DEFINE $LR_BLOCK_F_L = '</div></dd></dl></li></ul>' -->
 <!-- DEFINE $LR_BLOCK_F_R = '</div></div><br class="portal-clear" />' -->
 

styles/prosilver/template/portal/assets/jquery.getscrollbarwidth.js

@@ -0,0 +1,22 @@
+/*! Copyright (c) 2008 Brandon Aaron (brandon.aaron@gmail.com || http://brandonaaron.net)
+ * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) 
+ * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
+ */
+
+/**
+ * Gets the width of the OS scrollbar
+ */
+(function($) {
+	var scrollbarWidth = 0;
+	$.getScrollbarWidth = function() {
+		if ( !scrollbarWidth ) {
+			var $div = $('<div />')
+				.css({ width: 100, height: 100, overflow: 'auto', position: 'absolute', top: -1000, left: -1000 })
+				.prependTo('body').append('<div />').find('div')
+				.css({ width: '100%', height: 200 });
+			scrollbarWidth = 100 - $div.width();
+			$div.parent().remove();
+		}
+		return scrollbarWidth;
+	};
+})(jQuery);

styles/prosilver/template/portal/assets/portal.js

@@ -19,17 +19,22 @@ var portal_right_width;
  */
 phpbb.b3p_fix_right_column_margin = function() {
 	var width = $(window).width();
+	var $portal_right = $('#portal-right');
+	var $portal_left = $('#portal-left');
+	var $portal_center = $('#portal-center');
 
-	if (width <= 880) {
+	if (width <= (895 - $.getScrollbarWidth())) {
 		// Get height of left and center column
-		var center_height = $('#portal-center').outerHeight();
-		var left_height = $('#portal-left').outerHeight();
-
-		$('#portal-right').css('margin-top', -(center_height - left_height) + 'px');
-		$('#portal-right').width($('#portal-left').width());
+		var right_height = $portal_right.height();
+		var left_height = $portal_left.height();
+		// Get correct margin-left for portal-right and add 10px for padding
+		$portal_right.css('margin-left', - ($portal_right.width() + 1));
+		$portal_center.css('margin-top', Math.max(left_height, right_height) + 'px');
 	} else {
-		$('#portal-right').css('margin-top', '0px');
-		$('#portal-right').width(portal_right_width);
+		$portal_right.css('margin-top', '0px');
+		$portal_right.css('margin-left', -$portal_left.width());
+		$portal_right.width($portal_left.width());
+		$portal_center.css('margin-top', 0);
 	}
 };
 

styles/prosilver/template/portal/modules/announcements_center.html

@@ -1,14 +1,12 @@
-<!-- BEGIN announcements_center_row -->
-<!-- IF announcements_center_row.S_FIRST_ROW -->
 {$C_BLOCK_H_L}{$TITLE}{$C_BLOCK_H_R}
-<!-- ENDIF -->
-<!-- IF $S_POSTBODY_TOP --><div class="postbody" style="width: 100%"><!-- ENDIF -->
+<!-- IF $S_POSTBODY_TOP --><div class="postbody portal-module-postbody"><!-- ENDIF -->
+<!-- BEGIN announcements_center_row -->
 	<!-- IF announcements_center_row.S_NO_TOPICS  -->
-	<div class="post bg2" style="margin-bottom: 0px">
+	<div class="post bg2">
 		<div class="inner">
-			<span style="text-align: center;"><strong>{L_NO_ANNOUNCEMENTS}</strong></span>
+			<span><strong>{L_NO_ANNOUNCEMENTS}</strong></span>
 	<!-- ELSE -->
-	<div style="margin-bottom: <!-- IF announcements_center_row.S_LAST_ROW -->0px<!-- ELSE -->1px<!-- ENDIF -->;" class="post <!-- IF announcements_center_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --> portal-no-margin">
+	<div class="post <!-- IF announcements_center_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --> portal-no-margin">
 		<div class="inner">
 			<h4 class="first"><a <!-- IF announcements_center_row.S_FIRST_ROW -->id="a" <!-- ENDIF -->name="a{announcements_center_row.A_ID}"></a><!-- IF announcements_center_row.S_UNREAD_INFO --><a href="{announcements_center_row.U_VIEW_UNREAD}">{NEWEST_POST_IMG}</a><!-- ELSE --><a href="{announcements_center_row.U_LAST_COMMENTS}">{READ_POST_IMG}</a><!-- ENDIF --> {announcements_center_row.ATTACH_ICON_IMG} <!-- IF announcements_center_row.S_POLL --> <strong>{L_VIEW_TOPIC_POLL}{L_COLON} </strong><!-- ENDIF --><!-- IF announcements_center_row.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{announcements_center_row.TOPIC_ICON_IMG}" width="{announcements_center_row.TOPIC_ICON_IMG_WIDTH}" height="{announcements_center_row.TOPIC_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="{announcements_center_row.U_VIEW_COMMENTS}"><strong>{announcements_center_row.TITLE}</strong></a></h4>
 			<!-- IF announcements_center_row.PAGINATION --><strong class="pagination"><span>{announcements_center_row.PAGINATION}</span></strong><!-- ENDIF -->
@@ -16,7 +14,7 @@
 				<li>{L_POSTED} {L_POST_BY_AUTHOR}{L_COLON} {announcements_center_row.POSTER_FULL} &raquo; {announcements_center_row.TIME}</li>
 				<li class="rightside"><!-- IF announcements_center_row.FORUM_NAME -->{L_FORUM}{L_COLON} <strong><a href="{announcements_center_row.U_VIEWFORUM}">{announcements_center_row.FORUM_NAME}</a></strong><!-- ELSE -->{L_GLOBAL_ANNOUNCEMENT}<!-- ENDIF --></li>
 			</ul>
-			<!-- IF not $S_POSTBODY_TOP --><div class="postbody" style="width: 100%"><!-- ENDIF -->
+			<!-- IF not $S_POSTBODY_TOP --><div class="postbody portal-module-postbody"><!-- ENDIF -->
 				<div class="content">
 					<br />{announcements_center_row.TEXT}
 				</div>
@@ -28,11 +26,11 @@
 				<!-- END attachment -->
 			</dl>
 			<!-- ENDIF -->
-			<br style="clear:both" />
-			<span style="float: left;">{L_TOPIC_VIEWS}{L_COLON} {announcements_center_row.TOPIC_VIEWS} &nbsp;&bull;&nbsp; <a href="{announcements_center_row.U_VIEW_COMMENTS}" title="{L_VIEW_COMMENTS}">{L_COMMENTS}{L_COLON} {announcements_center_row.REPLIES}</a> &nbsp;&bull;&nbsp; <a href="{announcements_center_row.U_POST_COMMENT}">{L_POST_REPLY}</a></span>
-			<span style="float: right; margin: 0 0 5px 0">{announcements_center_row.OPEN}<a href="{announcements_center_row.U_READ_FULL}">{announcements_center_row.L_READ_FULL}</a>{announcements_center_row.CLOSE}</span>
+			<br class="portal-clear" />
+			<span class="portal-title-span">{L_TOPIC_VIEWS}{L_COLON} {announcements_center_row.TOPIC_VIEWS} &nbsp;&bull;&nbsp; <a href="{announcements_center_row.U_VIEW_COMMENTS}" title="{L_VIEW_COMMENTS}">{L_COMMENTS}{L_COLON} {announcements_center_row.REPLIES}</a> &nbsp;&bull;&nbsp; <a href="{announcements_center_row.U_POST_COMMENT}">{L_POST_REPLY}</a></span>
+			<span class="portal-read-all-link">{announcements_center_row.OPEN}<a href="{announcements_center_row.U_READ_FULL}">{announcements_center_row.L_READ_FULL}</a>{announcements_center_row.CLOSE}</span>
 			<div class="back2top"><a href="#wrap" class="top" title="{L_BACK_TO_TOP}">{L_BACK_TO_TOP}</a></div>
-			<!-- IF announcements_center_row.S_NOT_LAST --><br style="clear:both" /><!-- ENDIF -->
+			<!-- IF announcements_center_row.S_NOT_LAST --><br class="portal-clear" /><!-- ENDIF -->
 			<!-- IF announcements_center_row.S_LAST_ROW and (AP_PAGINATION or TOTAL_ANNOUNCEMENTS) -->
 				<hr class="dashed" />
 				<div class="pagination">
@@ -44,8 +42,6 @@
 		<!-- ENDIF -->
 		</div>
 	</div>
+<!-- END announcements_center_row -->
 <!-- IF $S_POSTBODY_TOP --></div><!-- ENDIF -->
-<!-- IF announcements_center_row.S_LAST_ROW -->
-{$C_BLOCK_F_L}{$C_BLOCK_F_R}
-<!-- ENDIF -->
-<!-- END announcements_center_row -->
+		{$C_BLOCK_F_L}{$C_BLOCK_F_R}

styles/prosilver/template/portal/modules/announcements_center_compact.html

@@ -1,9 +1,9 @@
 <!-- BEGIN announcements_center_row -->
 <!-- IF announcements_center_row.S_NO_TOPICS -->
 {$C_BLOCK_H_L}{$TITLE}{$C_BLOCK_H_R}
-	<div class="post bg2" style="margin-bottom: 0px">
+	<div class="post bg2 portal-no-margin">
 		<div class="inner">
-			<span style="text-align: center;"><strong>{L_NO_ANNOUNCEMENTS}</strong></span>
+			<span><strong>{L_NO_ANNOUNCEMENTS}</strong></span>
 		</div>
 	</div>
 {$C_BLOCK_F_L}{$C_BLOCK_F_R}
@@ -33,7 +33,7 @@
 					<!-- IF announcements_center_row.PAGINATION --><strong class="pagination"><span>{announcements_center_row.PAGINATION}</span></strong><!-- ENDIF -->
 						<br />{L_POSTED} {L_POST_BY_AUTHOR} {announcements_center_row.POSTER_FULL} &raquo; {announcements_center_row.TIME}
 					<!-- IF announcements_center_row.FORUM_NAME -->
-						<br />{L_FORUM}{L_COLON} <a href="{announcements_center_row.U_VIEWFORUM}" style="font-weight: bold;">{announcements_center_row.FORUM_NAME}</a>
+						<br />{L_FORUM}{L_COLON} <a href="{announcements_center_row.U_VIEWFORUM}" class="portal-forumtitle">{announcements_center_row.FORUM_NAME}</a>
 					<!-- ELSE -->
 						<br />{L_GLOBAL_ANNOUNCEMENT}
 					<!-- ENDIF -->

styles/prosilver/template/portal/modules/attachments_center.html

@@ -2,15 +2,15 @@
 <div class="panel bg1 portal-no-margin">
 	<div class="inner">
 	<!-- IF .attach_center -->
-		<span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;"><strong>{L_FILENAME}</strong></span><br />
+		<span class="portal-title-span"><strong>{L_FILENAME}</strong></span><br />
 		<!-- BEGIN attach_center -->
-			<span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;" class="portal-gensmall"><img src="{T_EXT_THEME_PATH}/images/portal/icon_topic_attach.gif" alt="" />&nbsp;<a href="{attach_center.U_TOPIC}" title="{attach_center.REAL_FILENAME}"><strong>{attach_center.FILENAME}</strong></a></span><br style="clear:both" />
-			<span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;padding-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->left<!-- ELSE -->right<!-- ENDIF -->:10px;">{L_FILESIZE}{L_COLON}</span><span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->left<!-- ELSE -->right<!-- ENDIF -->;padding-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->left<!-- ELSE -->right<!-- ENDIF -->:10px;" class="portal-gensmall"><strong>{attach_center.FILESIZE}</strong></span><br style="clear:both" />
-			<span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;padding-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->left<!-- ELSE -->right<!-- ENDIF -->:10px;">{L_DOWNLOADS}{L_COLON}</span><span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->left<!-- ELSE -->right<!-- ENDIF -->;padding-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->left<!-- ELSE -->right<!-- ENDIF -->:10px;" class="portal-gensmall"><strong>{attach_center.DOWNLOAD_COUNT}</strong></span><br style="clear:both" />
+			<span class="portal-title-span imageset icon_topic_attach">&nbsp;</span>&nbsp;<a class="portal-title-link" href="{attach_center.U_TOPIC}" title="{attach_center.REAL_FILENAME}"><strong>{attach_center.FILENAME}</strong></a><br class="portal-clear" />
+			<span class="portal-text-span">{L_FILESIZE}{L_COLON}</span><span class="portal-data-span portal-gensmall"><strong>{attach_center.FILESIZE}</strong></span><br class="portal-clear" />
+			<span class="portal-text-span">{L_DOWNLOADS}{L_COLON}</span><span class="portal-data-span portal-gensmall"><strong>{attach_center.DOWNLOAD_COUNT}</strong></span><br class="portal-clear" />
 			<!-- IF not attach_center.S_LAST_ROW --><hr class="dashed" /><!-- ENDIF -->
 		<!-- END attach_center -->
 	<!-- ELSE -->
-		<span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;" class="portal-gensmall"><strong>{L_NO_ATTACHMENTS}</strong></span><br />
+		<span class="portal-title-span portal-gensmall"><strong>{L_NO_ATTACHMENTS}</strong></span><br />
 	<!-- ENDIF -->
 	</div>
 </div>

styles/prosilver/template/portal/modules/attachments_side.html

@@ -1,13 +1,13 @@
 {$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}
 	<!-- IF .attach_side -->
-		<span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;"><strong>{L_FILENAME}</strong></span><br />
+		<span class="portal-title-span"><strong>{L_FILENAME}</strong></span><br />
 		<!-- BEGIN attach_side -->
-			<span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;" class="portal-gensmall"><img src="{T_EXT_THEME_PATH}/images/portal/icon_topic_attach.gif" alt="" />&nbsp;<a href="{attach_side.U_TOPIC}" title="{attach_side.REAL_FILENAME}"><strong>{attach_side.FILENAME}</strong></a></span><br style="clear:both" />
-			<span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;padding-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->left<!-- ELSE -->right<!-- ENDIF -->:10px;">{L_FILESIZE}{L_COLON}</span><span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->left<!-- ELSE -->right<!-- ENDIF -->;padding-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->left<!-- ELSE -->right<!-- ENDIF -->:10px;" class="portal-gensmall"><strong>{attach_side.FILESIZE}</strong></span><br style="clear:both" />
-			<span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;padding-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->left<!-- ELSE -->right<!-- ENDIF -->:10px;">{L_DOWNLOADS}{L_COLON}</span><span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->left<!-- ELSE -->right<!-- ENDIF -->;padding-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->left<!-- ELSE -->right<!-- ENDIF -->:10px;" class="portal-gensmall"><strong>{attach_side.DOWNLOAD_COUNT}</strong></span><br style="clear:both" />
+			<span class="portal-title-span portal-gensmall imageset icon_topic_attach">&nbsp;</span>&nbsp;<a class="portal-title-link" href="{attach_side.U_TOPIC}" title="{attach_side.REAL_FILENAME}"><strong>{attach_side.FILENAME}</strong></a><br class="portal-clear" />
+			<span class="portal-text-span">{L_FILESIZE}{L_COLON}</span><span class="portal-data-span portal-gensmall"><strong>{attach_side.FILESIZE}</strong></span><br class="portal-clear" />
+			<span class="portal-text-span">{L_DOWNLOADS}{L_COLON}</span><span class="portal-data-span portal-gensmall"><strong>{attach_side.DOWNLOAD_COUNT}</strong></span><br class="portal-clear" />
 			<!-- IF not attach_side.S_LAST_ROW --><hr class="dashed" /><!-- ENDIF -->
 		<!-- END attach_side -->
 	<!-- ELSE -->
-		<span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;" class="portal-gensmall"><strong>{L_NO_ATTACHMENTS}</strong></span><br />
+		<span class="portal-title-span portal-gensmall"><strong>{L_NO_ATTACHMENTS}</strong></span><br />
 	<!-- ENDIF -->
 {$LR_BLOCK_F_L}{$LR_BLOCK_F_R}

styles/prosilver/template/portal/modules/birthdays_side.html

@@ -2,15 +2,13 @@
 			<!-- IF BIRTHDAY_LIST -->
 			<strong>{L_CONGRATULATIONS}{L_COLON}</strong><br />
 			<!-- BEGIN board3_birthday_list -->
-			<span style="float:left;">
-				<img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" />
-			</span>
-			<span style="float:left; padding-left:5px; padding-top:2px;">
+			<span class="portal-user-icon"></span>
+			<span class="portal-user-span">
 				{board3_birthday_list.USER}
 			</span>
-			<span style="float: right;">
+			<span class="portal-user-annotation">
 				<!-- IF board3_birthday_list.AGE -->{board3_birthday_list.AGE}<!-- ENDIF -->
-			</span><br style="clear: both" />
+			</span><br class="portal-clear" />
 			<!-- END board3_birthday_list -->
 			<!-- ELSE -->
 			{L_NO_BIRTHDAYS}
@@ -21,15 +19,13 @@
 				<br />
 				<!-- IF BIRTHDAYS_AHEAD_LIST -->
 				<!-- BEGIN board3_birthday_ahead_list -->
-				<span style="float:left;">
-					<img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" />
-				</span>
-				<span style="float:left; padding-left: 5px; padding-top: 3px;">
+				<span class="portal-user-icon"></span>
+				<span class="portal-user-span">
 					<span title="{board3_birthday_ahead_list.DATE}">{board3_birthday_ahead_list.USER}</span>
 				</span>
-				<span style="float: right; padding-top:3px;">
+				<span class="portal-user-annotation">
 					<!-- IF board3_birthday_ahead_list.AGE -->{board3_birthday_ahead_list.AGE}<!-- ENDIF -->
-				</span><br style="clear: both" />
+				</span><br class="portal-clear" />
 				<!-- END board3_birthday_ahead_list -->
 				<!-- ELSE -->
 				{L_NO_BIRTHDAYS_AHEAD}

styles/prosilver/template/portal/modules/calendar_side.html

@@ -1,32 +1,32 @@
 <!-- BEGIN minical -->
 <!-- IF minical.MODULE_ID eq $MODULE_ID -->
-<a id="minical{minical.MODULE_ID}" style="float: right;"></a>
+<a id="minical{minical.MODULE_ID}"></a>
 {$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}	
-	<table style="width: 100%;">
+	<table class="portal-module-postbody">
 		<tr>
-			<td style="text-align: left;" colspan="2"><!-- IF S_CONTENT_DIRECTION eq 'rtl' -->{minical.U_NEXT_MONTH}<!-- ELSE -->{minical.U_PREV_MONTH}<!-- ENDIF --></td>
-			<td colspan="3" style="text-align: center;"><span class="genmed">{minical.L_MINI_CAL_MONTH}</span></td>
-			<td style="text-align: right;" colspan="2"><!-- IF S_CONTENT_DIRECTION eq 'rtl' -->{minical.U_PREV_MONTH}<!-- ELSE -->{minical.U_NEXT_MONTH}<!-- ENDIF --></td>
+			<td class="portal-calendar-go-previous" colspan="2"><!-- IF S_CONTENT_DIRECTION eq 'rtl' -->{minical.U_NEXT_MONTH}<!-- ELSE -->{minical.U_PREV_MONTH}<!-- ENDIF --></td>
+			<td colspan="3" class="portal-calendar-current-month"><span class="genmed">{minical.L_MINI_CAL_MONTH}</span></td>
+			<td class="portal-calendar-go-next" colspan="2"><!-- IF S_CONTENT_DIRECTION eq 'rtl' -->{minical.U_PREV_MONTH}<!-- ELSE -->{minical.U_NEXT_MONTH}<!-- ENDIF --></td>
 		</tr>
-		<tr>
+		<tr class="portal-calendar-days-title">
 			<!-- IF minical.S_SUNDAY_FIRST -->
-				<td style="width: 14%;"><span class="gensmall" style="font-weight: bold">{minical.L_MINI_CAL_SUN}</span></td>
+				<td><span class="gensmall">{minical.L_MINI_CAL_SUN}</span></td>
 			<!-- ENDIF -->
-				<td style="width: 14%;"><span class="gensmall" style="font-weight: bold">{minical.L_MINI_CAL_MON}</span></td>
-				<td style="width: 14%;"><span class="gensmall" style="font-weight: bold">{minical.L_MINI_CAL_TUE}</span></td>
-				<td style="width: 14%;"><span class="gensmall" style="font-weight: bold">{minical.L_MINI_CAL_WED}</span></td>
-				<td style="width: 14%;"><span class="gensmall" style="font-weight: bold">{minical.L_MINI_CAL_THU}</span></td>
-				<td style="width: 14%;"><span class="gensmall" style="font-weight: bold">{minical.L_MINI_CAL_FRI}</span></td>
-				<td style="width: 14%;"><span class="gensmall" style="font-weight: bold">{minical.L_MINI_CAL_SAT}</span></td>
+				<td><span class="gensmall">{minical.L_MINI_CAL_MON}</span></td>
+				<td><span class="gensmall">{minical.L_MINI_CAL_TUE}</span></td>
+				<td><span class="gensmall">{minical.L_MINI_CAL_WED}</span></td>
+				<td><span class="gensmall">{minical.L_MINI_CAL_THU}</span></td>
+				<td><span class="gensmall">{minical.L_MINI_CAL_FRI}</span></td>
+				<td><span class="gensmall">{minical.L_MINI_CAL_SAT}</span></td>
 			<!-- IF not minical.S_SUNDAY_FIRST -->
-				<td style="width: 14%;"><span class="gensmall" style="font-weight: bold">{minical.L_MINI_CAL_SUN}</span></td>
+				<td><span class="gensmall">{minical.L_MINI_CAL_SUN}</span></td>
 			<!-- ENDIF -->
 		</tr>
 		<!-- BEGIN mini_cal_row -->
 		<!-- IF minical.mini_cal_row.MODULE_ID eq $MODULE_ID -->
-		<tr>
+		<tr class="portal-calendar-days">
 			<!-- BEGIN mini_cal_days -->
-				<td style="width: 14%; text-align: center;"><span class="gensmall">{minical.mini_cal_row.mini_cal_days.MINI_CAL_DAY}</span></td>
+				<td><span class="gensmall">{minical.mini_cal_row.mini_cal_days.MINI_CAL_DAY}</span></td>
 			<!-- END mini_cal_days -->
 		</tr>
 		<!-- ENDIF -->
@@ -34,55 +34,55 @@
 	</table>
 	<!-- IF minical.S_DISPLAY_EVENTS -->
 	<hr class="dashed" />
-	<div class="menutitle" style="font: bold 12px 'Trebuchet MS','Lucida Grande',Arial,sans-serif; text-decoration: underline;">{L_CURRENT_EVENTS}{L_COLON}</div>
+	<div class="menutitle portal-calendar-events-heading">{L_CURRENT_EVENTS}{L_COLON}</div>
 	<ul class="portal-events">
 		<!-- BEGIN cur_events -->
 
 		<li class="row">
 			<dl class="icon">
-				<dt style="width: 100%; padding-left: 0px; padding-bottom: 5px;">
+				<dt class="portal-calendar-event-listing">
 					<!-- IF minical.cur_events.EVENT_URL --><a href="{minical.cur_events.EVENT_URL}" title="{minical.cur_events.EVENT_TITLE}" <!-- IF minical.cur_events.EVENT_URL_NEW_WINDOW -->onclick="window.open('{minical.cur_events.EVENT_URL}'); return false;"<!-- ENDIF -->><!-- ENDIF -->
-					<span style="font-weight: bold;">{minical.cur_events.EVENT_TITLE}{L_COLON}</span><br />
+					<span class="portal-calendar-event-title">{minical.cur_events.EVENT_TITLE}{L_COLON}</span><br />
 					<!-- IF minical.cur_events.ALL_DAY -->{L_EVENT_START}{L_COLON}&nbsp;{minical.cur_events.START_TIME}<br />{L_EVENT_ALL_DAY}<br />
 					<!-- ELSEIF not minical.cur_events.ALL_DAY and minical.cur_events.END_TIME -->{L_EVENT_START}{L_COLON}&nbsp;{minical.cur_events.START_TIME}<br />{L_EVENT_END}{L_COLON}&nbsp;{minical.cur_events.END_TIME}<br />
 					<!-- ELSE -->{L_EVENT_ALL_DAY}<br />
 					<!-- ENDIF -->
-					<!-- IF minical.cur_events.EVENT_DESC --><span style="font-style: italic;">{minical.cur_events.EVENT_DESC}</span><!-- ENDIF -->
+					<!-- IF minical.cur_events.EVENT_DESC --><span class="portal-calendar-event-description">{minical.cur_events.EVENT_DESC}</span><!-- ENDIF -->
 					<!-- IF minical.cur_events.EVENT_URL --></a><!-- ENDIF -->
 				</dt>
 			</dl>
 		</li>
 
 		<!-- BEGINELSE -->
-		<li class="calendar-info"><span style="float:left;" class="gensmall"><strong>{L_NO_CUR_EVENTS}</strong></span><br /></li>
+		<li class="calendar-info"><span class="gensmall portal-title-span"><strong>{L_NO_CUR_EVENTS}</strong></span><br /></li>
 		<!-- END cur_events -->
 	</ul>
-	<hr style="margin: 5px 0; border-top: 0;" />
-	<div class="menutitle" style="font: bold 12px 'Trebuchet MS','Lucida Grande',Arial,sans-serif; text-decoration: underline;">{L_UPCOMING_EVENTS}{L_COLON}</div>
+	<hr class="portal-calendar-divider" />
+	<div class="menutitle portal-calendar-events-heading">{L_UPCOMING_EVENTS}{L_COLON}</div>
 	<ul class="portal-events">
 		<!-- BEGIN upcoming_events -->
 
 		<li class="row">
 			<dl class="icon">
-				<dt style="width: 100%; padding-left: 0px; padding-bottom: 5px;">
+				<dt class="portal-calendar-event-listing">
 					<!-- IF minical.upcoming_events.EVENT_URL --><a href="{minical.upcoming_events.EVENT_URL}" title="{minical.upcoming_events.EVENT_TITLE}" <!-- IF minical.upcoming_events.EVENT_URL_NEW_WINDOW -->onclick="window.open('{minical.upcoming_events.EVENT_URL}'); return false;"<!-- ENDIF -->><!-- ENDIF -->
-					<span style="font-weight: bold;">{minical.upcoming_events.EVENT_TITLE}{L_COLON}</span><br />
+					<span class="portal-calendar-event-title">{minical.upcoming_events.EVENT_TITLE}{L_COLON}</span><br />
 					<!-- IF not minical.upcoming_events.ALL_DAY and not minical.upcoming_events.END_TIME -->{L_EVENT_TIME}{L_COLON}&nbsp;{minical.upcoming_events.START_TIME}<br />
 					<!-- ELSEIF not minical.upcoming_events.ALL_DAY and minical.upcoming_events.END_TIME -->{L_EVENT_START}{L_COLON}&nbsp;{minical.upcoming_events.START_TIME}<br />{L_EVENT_END}{L_COLON}&nbsp;{minical.upcoming_events.END_TIME}<br />
 					<!-- ELSE -->{L_EVENT_TIME}{L_COLON}&nbsp;{minical.upcoming_events.START_TIME}<br />{L_EVENT_ALL_DAY}<br />
 					<!-- ENDIF -->
-					<!-- IF minical.upcoming_events.EVENT_DESC --><span style="font-style: italic;">{minical.upcoming_events.EVENT_DESC}</span><br /><!-- ENDIF -->
+					<!-- IF minical.upcoming_events.EVENT_DESC --><span class="portal-calendar-event-description">{minical.upcoming_events.EVENT_DESC}</span><br /><!-- ENDIF -->
 					<!-- IF minical.upcoming_events.EVENT_URL --></a><!-- ENDIF -->
 				</dt>
 			</dl>
 		</li>
 
 		<!-- BEGINELSE -->
-		<li class="calendar-info"><span style="float:left;" class="gensmall"><strong>{L_NO_UPCOMING_EVENTS}</strong></span><br /></li>
+		<li class="calendar-info"><span class="gensmall portal-title-span"><strong>{L_NO_UPCOMING_EVENTS}</strong></span><br /></li>
 		<!-- END upcoming_events -->
 	</ul>
 	<br />
 	<!-- ENDIF -->
 {$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
 <!-- ENDIF -->
-<!-- END minical -->
+<!-- END minical -->

styles/prosilver/template/portal/modules/clock_side.html

@@ -1,32 +1,42 @@
 {$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}
+<!-- IF not B3P_CLOCK_SRC -->
 		<div class="portal-clock-wrapper">
 			<div class="portal-clock">
 				<div class="portal-clock-back">
 					<div class="portal-clock-back-upper">
-						<img src="{T_EXT_THEME_PATH}/images/portal/spacer_up.png" alt="" /><div class="portal-clock-back-hours-up"></div>
+						<img class="portal-clock-spacer-up" alt="" /><div class="portal-clock-back-hours-up"></div>
 						<div class="portal-clock-back-minutes-up-left" ></div><div class="portal-clock-back-minutes-up-right"></div>
 						<div class="portal-clock-back-seconds-up-left"></div><div class="portal-clock-back-seconds-up-right"></div>
 					</div>
 					<div class="portal-clock-back-lower">
-						<img src="{T_EXT_THEME_PATH}/images/portal/spacer_down.png" alt="" /><div class="portal-clock-back-hours-down"></div>
+						<img class="portal-clock-spacer-down" alt="" /><div class="portal-clock-back-hours-down"></div>
 						<div class="portal-clock-back-minutes-down-left"></div><div class="portal-clock-back-minutes-down-right"></div>
 						<div class="portal-clock-back-seconds-down-left"></div><div class="portal-clock-back-seconds-down-right"></div>
 					</div>
 				</div>
 				<div class="portal-clock-front">
 					<div class="portal-clock-front-upper">
-						<img src="{T_EXT_THEME_PATH}/images/portal/spacer_up.png" alt="" /><div class="portal-clock-front-hours-up"></div>
+						<img class="portal-clock-spacer-up" alt="" /><div class="portal-clock-front-hours-up"></div>
 						<div class="portal-clock-front-minutes-up-left"></div><div class="portal-clock-front-minutes-up-right"></div>
 						<div class="portal-clock-front-seconds-up-left"></div><div class="portal-clock-front-seconds-up-right"></div>
 					</div>
 					<div class="portal-clock-front-lower">
-						<img src="{T_EXT_THEME_PATH}/images/portal/spacer_down.png" alt="" /><div class="portal-clock-front-hours-down"></div>
+						<img class="portal-clock-spacer-down" alt="" /><div class="portal-clock-front-hours-down"></div>
 						<div class="portal-clock-front-minutes-down-left"></div><div class="portal-clock-front-minutes-down-right"></div>
 						<div class="portal-clock-front-seconds-down-left"></div><div class="portal-clock-front-seconds-down-right"></div>
 					</div>
 				</div>
 			</div>
 		</div>
-<!-- INCLUDEJS portal/modules/jquery_easing_1_3.js -->
-<!-- INCLUDEJS portal/modules/portal_clock.js -->
+<!-- INCLUDEJS portal/assets/jquery_easing_1_3.js -->
+<!-- INCLUDEJS portal/assets/portal_clock.js -->
+<!-- ELSE -->
+		<div style="text-align: center;">
+			<br />
+			<object type="application/x-shockwave-flash" data="{T_THEME_PATH}/images/portal/{B3P_CLOCK_SRC}" width="140">
+				<param name="wmode" value="transparent" />
+				<param name="movie" value="{T_THEME_PATH}/images/portal/{B3P_CLOCK_SRC}" />
+			</object>
+		</div>
+<!-- ENDIF -->
 {$LR_BLOCK_F_L}{$LR_BLOCK_F_R}

styles/prosilver/template/portal/modules/custom_center.html

@@ -1,8 +1,8 @@
 {$C_BLOCK_H_L}{$TITLE}{$C_BLOCK_H_R}
-<div class="panel bg1" style="margin-bottom: 0px">
+<div class="panel bg1 portal-no-margin">
 	<div class="inner">
-		<div class="postbody" style="width: 100%">
-			<div class="content" style="min-height: 1em;">{$CUSTOM_CODE}</div>
+		<div class="postbody portal-module-postbody">
+			<div class="content portal-module-content">{$CUSTOM_CODE}</div>
 		</div>
 	</div>
 </div>

styles/prosilver/template/portal/modules/custom_side.html

@@ -1,7 +1,7 @@
 {$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}
    <div class="inner">
-      <div class="postbody" style="width: 100%">
-         <div class="content" style="min-height: 1em;">{$CUSTOM_CODE}</div>
+      <div class="postbody portal-module-postbody">
+         <div class="content portal-module-content">{$CUSTOM_CODE}</div>
       </div>
    </div>
 {$LR_BLOCK_F_L}{$LR_BLOCK_F_R}

styles/prosilver/template/portal/modules/donation_center.html

@@ -1,12 +1,12 @@
 {$C_BLOCK_H_L}{$TITLE}{$C_BLOCK_H_R}
 	<ul class="topiclist bg1">
 		<li><dl><dt></dt>
-			<dd class="portal-responsive-show" style="border-left: 0px">
-				<div style="text-align: left; margin: 5px 5px 5px 5px">
+			<dd class="portal-donation-center-content portal-responsive-show">
+				<div>
 			<strong>{SITENAME}</strong> {L_DONATION_TEXT}
 			<br />
-			<div style="float: left; padding: 5px 5px 5px 5px"><img src="{T_EXT_THEME_PATH}/images/portal/paypal.gif" alt="" /></div>
-		<form action="https://www.paypal.com/cgi-bin/webscr" method="post" style="padding-top:15px">
+			<div class="portal-paypal-icon">&nbsp;</div>
+		<form action="https://www.paypal.com/cgi-bin/webscr" method="post" class="portal-donation-form">
 		<div>
 			<input type="hidden" name="cmd" value="_xclick" />
 			<input type="hidden" name="business" value="{PAY_ACC_CENTER}" />

styles/prosilver/template/portal/modules/donation_side.html

@@ -1,5 +1,5 @@
 {$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}
-<div style="text-align: center;">
+<div class="portal-centered-content">
 <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
 	<div>
 		<input type="hidden" name="cmd" value="_xclick" />

styles/prosilver/template/portal/modules/friends_side.html

@@ -1,17 +1,17 @@
 {$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}
 	<strong style="color:green<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->; float: right;<!-- ENDIF -->">{L_FRIENDS_ONLINE}</strong><br />
 	<!-- BEGIN b3p_friends_online -->
-        <span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;"><img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" /></span><span style="<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->float:right; padding-right:5px;<!-- ELSE -->float:left; padding-left:5px;<!-- ENDIF --> padding-top:2px;">{b3p_friends_online.USERNAME_FULL}</span><br style="clear:both" />
+        <span class="portal-user-icon"></span><span class="portal-user-span">{b3p_friends_online.USERNAME_FULL}</span><br class="portal-clear" />
     <!-- BEGINELSE -->
-        <span style="<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->float:right; padding-right:5px;<!-- ELSE -->float:left; padding-left:5px;<!-- ENDIF --> padding-top:2px;">{L_NO_FRIENDS_ONLINE}</span>
-        <br style="clear:both" />
+        <span class="portal-user-span">{L_NO_FRIENDS_ONLINE}</span>
+        <br class="portal-clear" />
     <!-- END b3p_friends_online -->
-		<br style="clear:both" />
+		<br class="portal-clear" />
 		<strong style="color:red<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->; float: right;<!-- ENDIF -->">{L_FRIENDS_OFFLINE}</strong><br />
 	<!-- BEGIN b3p_friends_offline -->
-        <span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;"><img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" /></span><span style="<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->float:right; padding-right:5px;<!-- ELSE -->float:left; padding-left:5px;<!-- ENDIF --> padding-top:2px;">{b3p_friends_offline.USERNAME_FULL}</span><br style="clear:both" />
+        <span class="portal-user-icon"></span><span class="portal-user-span">{b3p_friends_offline.USERNAME_FULL}</span><br class="portal-clear" />
     <!-- BEGINELSE -->
-        <span style="<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->float:right; padding-right:5px;<!-- ELSE -->float:left; padding-left:5px;<!-- ENDIF --> padding-top:2px;">{L_NO_FRIENDS_OFFLINE}</span>
+        <span class="portal-user-span">{L_NO_FRIENDS_OFFLINE}</span>
     <!-- END b3p_friends_offline -->
 	<br />
-{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
+{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}

styles/prosilver/template/portal/modules/latest_members_side.html

@@ -1,18 +1,8 @@
 {$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}
-	<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-	<span style="float:left;"><strong>{L_JOINED}</strong></span>
-	<span style="float:right;padding-right:10px;"><strong>{L_USERNAME}</strong></span><br style="clear:both" />
-	<!-- ELSE -->
-	<span style="float:left;"><strong>{L_USERNAME}</strong></span>
-	<span style="float:right;padding-right:10px;"><strong>{L_JOINED}</strong></span><br style="clear:both" />
-	<!-- ENDIF -->
+	<span class="portal-user-span"><strong>{L_USERNAME}</strong></span>
+	<span class="portal-user-annotation"><strong>{L_JOINED}</strong></span><br class="portal-clear" />
 	<!-- BEGIN latest_members -->
-		<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-		<span style="float:left;">{latest_members.JOINED}</span>
-		<span style="float:right;padding-right:10px; padding-top:2px;"><img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" /></span><span style="float:right; padding-right:5px; padding-top:2px;">{latest_members.USERNAME_FULL}</span><br style="clear:both" />
-		<!-- ELSE -->
-		<span style="float:left;"><img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" /></span><span style="float:left; padding-left:5px; padding-top:2px;">{latest_members.USERNAME_FULL}</span>
-		<span style="float:right;padding-right:10px; padding-top:2px;">{latest_members.JOINED}</span><br style="clear:both" />
-		<!-- ENDIF -->
+		<span class="portal-user-icon"></span><span class="portal-user-span">{latest_members.USERNAME_FULL}</span>
+		<span class="portal-user-annotation">{latest_members.JOINED}</span><br class="portal-clear" />
 	<!-- END latest_members -->
 {$LR_BLOCK_F_L}{$LR_BLOCK_F_R}

styles/prosilver/template/portal/modules/leaders_ext_side.html

@@ -1,11 +1,11 @@
 {$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}
 	<!-- BEGIN group -->
-		<strong<!-- IF S_CONTENT_DIRECTION eq 'rtl' --> style="float: right;"<!-- ENDIF -->><a href="{group.U_GROUP}" style="color: #{group.GROUP_COLOUR};" class="username-coloured">{group.GROUP_NAME}</a></strong><br />
+		<strong class="portal-user-span"><a href="{group.U_GROUP}" style="color: #{group.GROUP_COLOUR};" class="username-coloured">{group.GROUP_NAME}</a></strong><br class="portal-clear" />
 	<!-- BEGIN member -->
-		<span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;"><img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" /></span><span style="<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->float:right; padding-right:5px;<!-- ELSE -->float:left; padding-left:5px;<!-- ENDIF --> padding-top:2px;"><strong>{group.member.USERNAME_FULL}</strong></span><br style="clear:both" />
+		<span class="portal-user-icon"></span><span class="portal-user-span"><strong>{group.member.USERNAME_FULL}</strong></span><br class="portal-clear" />
 	<!-- END member -->
-	<br style="clear:both" />
+	<br class="portal-clear" />
 	<!-- BEGINELSE -->
 		{L_NO_GROUPS_P}
 	<!-- END group -->
-{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
+{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}

styles/prosilver/template/portal/modules/leaders_side.html

@@ -1,14 +1,14 @@
 {$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}
-	<strong<!-- IF S_CONTENT_DIRECTION eq 'rtl' --> style="float: right;"<!-- ENDIF -->>{L_ADMINISTRATORS}</strong><br />
+	<strong class="portal-user-span">{L_ADMINISTRATORS}</strong><br class="portal-clear" />
 	<!-- BEGIN b3p_admins -->
-		<span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;"><img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" /></span><span style="<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->float:right; padding-right:5px;<!-- ELSE -->float:left; padding-left:5px;<!-- ENDIF --> padding-top:2px;"><strong>{b3p_admins.USERNAME_FULL}</strong></span><br style="clear:both" />
+		<span class="portal-user-icon"></span><span class="portal-user-span"><strong>{b3p_admins.USERNAME_FULL}</strong></span><br class="portal-clear" />
 	<!-- BEGINELSE -->
 		{L_NO_ADMINISTRATORS_P}<br /><br />
 	<!-- END b3p_admins -->
-	<br style="clear:both" />
-	<strong<!-- IF S_CONTENT_DIRECTION eq 'rtl' --> style="float: right;"<!-- ENDIF -->>{L_MODERATORS}</strong><br />
+	<br class="portal-clear" />
+	<strong class="portal-user-span">{L_MODERATORS}</strong><br class="portal-clear" />
 	<!-- BEGIN b3p_moderator -->
-		<span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;"><img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" /></span><span style="<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->float:right; padding-right:5px;<!-- ELSE -->float:left; padding-left:5px;<!-- ENDIF --> padding-top:2px;"><strong>{b3p_moderator.USERNAME_FULL}</strong></span><br style="clear:both" />
+		<span class="portal-user-icon"></span><span class="portal-user-span"><strong>{b3p_moderator.USERNAME_FULL}</strong></span><br class="portal-clear" />
 	<!-- BEGINELSE -->
 		{L_NO_MODERATORS_P}
 	<!-- END b3p_moderator -->

styles/prosilver/template/portal/modules/links_side.html

@@ -4,7 +4,7 @@
 			<!-- BEGIN portallinks -->
 				<!-- IF $MODULE_ID eq portallinks.MODULE_ID --><li><a href="{portallinks.LINK_URL}" title="{portallinks.LINK_TITLE}" <!-- IF portallinks.NEW_WINDOW -->onclick="window.open('{portallinks.LINK_URL}'); return false;"<!-- ENDIF -->>{portallinks.LINK_TITLE}</a></li><!-- ENDIF -->
 			<!-- BEGINELSE -->
-				<span style="float:left;" class="gensmall"><strong>{L_LINKS_NO_LINKS}</strong></span><br />
+				<span class="portal-title-span gensmall"><strong>{L_LINKS_NO_LINKS}</strong></span><br />
 			<!-- END portallinks -->
 			</ul>
 	</div>

styles/prosilver/template/portal/modules/login_box_side.html

@@ -1,4 +1,4 @@
-<form action="{S_LOGIN_ACTION}" method="post">
+<form action="{S_LOGIN_ACTION}" method="post" id="portal-login-box">
 <div>
 {$LR_BLOCK_H_L}<a href="{U_LOGIN_LOGOUT}"><!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}</a>{$LR_BLOCK_H_R}
 	<span class="genmed">{L_USERNAME}{L_COLON}</span><br />

styles/prosilver/template/portal/modules/main_menu_side.html

@@ -12,7 +12,7 @@
 		<!-- ENDIF -->
 	<!-- BEGINELSE -->
 		<ul>
-			<span style="float:left;" class="gensmall"><strong>{L_MENU_NO_LINKS}</strong></span><br />
+			<span class="portal-title-span gensmall"><strong>{L_MENU_NO_LINKS}</strong></span><br />
 		</ul>
 	<!-- END portalmenu -->
 	</div>