Merge pull request #423 from marc1706/ticket/361

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

.coveralls.yml

@@ -0,0 +1,5 @@
+#.coveralls.yml
+
+src_dir: ../../phpBB3
+coverage_clover: ../../phpBB3/build/logs/clover.xml
+json_path: ../../phpBB3/build/logs/coveralls-upload.json

.gitattributes

@@ -0,0 +1,14 @@
+tests/		export-ignore
+develop/	export-ignore
+travis/		export-ignore
+.gitattributes	export-ignore
+.gitignore	export-ignore
+.travis.yml	export-ignore
+phpunit.xml.*	export-ignore
+README.md	export-ignore
+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

.gitignore

@@ -1 +1,3 @@
-/.idea/*
+/.idea/*
+/tests/test_config.php
+/vendor/

.travis.yml

@@ -0,0 +1,72 @@
+language: php
+
+matrix:
+  include:
+    - php: 5.3.3
+      env: DB=mysqli
+    - php: 5.3
+      env: DB=mysqli # MyISAM
+    - php: 5.4
+      env: DB=mysqli
+    - php: 5.4
+      env: DB=mysql
+    - php: 5.4
+      env: DB=mariadb
+    - php: 5.4
+      env: DB=postgres
+    - php: 5.4
+      env: DB=sqlite3
+    - php: 5.5
+      env: DB=mysqli
+    - php: 5.6
+      env: DB=mysqli
+    - php: hhvm
+      env: DB=mysqli
+  allow_failures:
+    - php: hhvm
+  fast_finish: true
+
+env:
+  global:
+    - EXTNAME="board3/portal"
+    - SNIFF="1"        # Should we run code sniffer on your code?
+    - IMAGE_ICC="0"    # Should we run icc profile sniffer on your images?
+    - COVERALLS="1"    # Should we run coveralls?
+    - EPV="1"          # Should we run EPV (Extension Pre Validator) on your code?
+    - SPELLCHECK="1"   # Should the php files be checked for obvious spelling errors?
+    - PHPBB_BRANCH="develop-ascraeus"
+
+branches:
+  except:
+    - master
+    - develop-1_0_X
+
+install:
+  - php composer.phar install --dev --no-interaction --prefer-source
+  - travis/prepare-phpbb.sh $EXTNAME $PHPBB_BRANCH
+  - cp .coveralls.yml ../../phpBB3/phpBB/.coveralls.yml
+  - cd ../../phpBB3
+  - travis/prepare-extension.sh $EXTNAME $PHPBB_BRANCH
+  - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION
+  - sh -c "if [ '$COVERALLS' != '0' ]; then ../board3/Board3-Portal/travis/prepare-coverage.sh $DB $TRAVIS_PHP_VERSION; fi"
+
+before_script:
+  - travis/setup-database.sh $DB $TRAVIS_PHP_VERSION
+  - mkdir build/logs
+  - chmod +wx build/logs
+
+script:
+  - sh -c "if [ '$SNIFF' != '0' ]; then travis/ext-sniff.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi"
+  - sh -c "if [ '$IMAGE_ICC' != '0' ]; then travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION; fi"
+  - ../board3/Board3-Portal/travis/run-testsuite.sh $DB $TRAVIS_PHP_VERSION
+  - sh -c "if [ '$EPV' != '0' ]; then ../board3/Board3-Portal/travis/run-epv.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi"
+
+after_script:
+  - sh -c "if [ '$COVERALLS' != '0' ]; then ../board3/Board3-Portal/travis/run-coveralls.sh $DB $TRAVIS_PHP_VERSION; fi"
+
+notifications:
+  email:
+    recipients:
+      - admin@m-a-styles.de
+    on_success: change
+    on_failure: change

README.md

@@ -1,13 +1,21 @@
-#Board3 Portal 2.0.0
+#Board3 Portal 2.1.x
 
-Board Portal 2.0.0 is a second generation portal for phpBB 3.0.x. It adds a portal with several blocks to your forum.
+Board Portal 2.1.x is a second generation portal for phpBB 3.1.x. It 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.
 
 ##How to use
 
-You can download the current development version of Board3 Portal 2.0.0 here or download the current release at [www.board3.de](http://www.board3.de/ "Board3 • Portal").  
+You can download the current development version of Board3 Portal 2.1.x here or download the current release at [www.board3.de](http://www.board3.de/ "Board3 • Portal").  
-Board3 Portal can be installed via AutoMOD or manually by following the instructions in install.xml (open it with your browser).
+Board3 Portal 2.1.x can be installed via the phpBB 3.1 ACP.
+
 
 ##Support
 
 Support for Board3 Portal can be found at [www.board3.de](http://www.board3.de/ "Board3 • Portal") or on [www.phpbb.com](http://www.phpbb.com/community/viewtopic.php?f=70&t=2131824/ "phpBB • Board3 Portal").
+The extension is currently under heavy development and not supported until further notice.
+
+## AUTOMATED TESTING
+
+We are starting to have unit and functional tests in order to prevent regressions. You can check our travis build below.
+develop-2.1.x - [![Build Status](https://api.travis-ci.org/board3/Board3-Portal.png?branch=develop-2.1.x)](https://travis-ci.org/board3/Board3-Portal)
+[![Coverage Status](https://coveralls.io/repos/board3/Board3-Portal/badge.png?branch=develop-2.1.x)](https://coveralls.io/r/board3/Board3-Portal?branch=develop-2.1.x)

acp/portal_info.php

@@ -1,32 +1,29 @@
 <?php
 /**
 *
-* @package Board3 Portal v2
+* @package Board3 Portal v2.1
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-if (!defined('IN_PHPBB'))
+namespace board3\portal\acp;
-{
-	exit;
-}
 
 /**
 * @package module_install
 */
-class acp_portal_info
+class portal_info
 {
 	public function module()
 	{
 		return array(
-			'filename'	=> 'acp_portal',
+			'filename'	=> '\board3\portal\acp\portal_module',
 			'title'		=> 'ACP_PORTAL',
 			'version'	=> '2.0.0b2',
 			'modes'		=> array(
 				'config'		=> array('title' => 'ACP_PORTAL_GENERAL_INFO',	'auth' => 'acl_a_manage_portal', 'cat' => array('ACP_PORTAL')),
 				'modules'		=> array('title' => 'ACP_PORTAL_MODULES',	'auth' => 'acl_a_manage_portal', 'cat' => array('ACP_PORTAL')),
-				'upload_module'		=> array('title' => 'ACP_PORTAL_UPLOAD',	'auth' => 'acl_a_manage_portal', 'cat' => array('ACP_PORTAL')),
+				// 'upload_module'		=> array('title' => 'ACP_PORTAL_UPLOAD',	'auth' => 'acl_a_manage_portal', 'cat' => array('ACP_PORTAL')),
 			),
 		);
 	}

adm/style/portal/acp_editor.js

@@ -331,11 +331,13 @@ function storeCaret(textEl)
 /**
 * Color pallette
 */
-function colorPalette(dir, width, height)
+function colorPalette(dir, width, height) {
-{
+	var r = 0,
-	var r = 0, g = 0, b = 0;
+		g = 0,
-	var numberList = new Array(6);
+		b = 0,
-	var color = '';
+		numberList = new Array(6),
+		color = '',
+		html = '';
 
 	numberList[0] = '00';
 	numberList[1] = '40';
@@ -343,44 +345,47 @@ function colorPalette(dir, width, height)
 	numberList[3] = 'BF';
 	numberList[4] = 'FF';
 
-	document.writeln('<table cellspacing="1" cellpadding="0" border="0">');
+	html += '<table>';
 
-	for (r = 0; r < 5; r++)
+	for (r = 0; r < 5; r++) {
-	{
+		if (dir == 'h') {
-		if (dir == 'h')
+			html += '<tr>';
-		{
-			document.writeln('<tr>');
 		}
 
-		for (g = 0; g < 5; g++)
+		for (g = 0; g < 5; g++) {
-		{
+			if (dir == 'v') {
-			if (dir == 'v')
+				html += '<tr>';
-			{
-				document.writeln('<tr>');
 			}
 
-			for (b = 0; b < 5; b++)
+			for (b = 0; b < 5; b++) {
-			{
 				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
-				document.write('<td bgcolor="#' + color + '" style="width: ' + width + 'px; height: ' + height + 'px;">');
+				html += '<td style="background-color: #' + color + '; width: ' + width + 'px; height: ' + height + 'px;">';
-				document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;" style="margin: -4px 0px -4px 2px;"><img src="images/spacer.gif" width="' + width + '" height="' + (height+10) + '" alt="#' + color + '" title="#' + color + '" style="margin: -4px;" /></a>');
+				html += '<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;" style="display: block; width: ' + width + 'px; height: ' + height + 'px; " alt="#' + color + '" title="#' + color + '"></a>';
-				document.writeln('</td>');
+				html += '</td>';
 			}
 
-			if (dir == 'v')
+			if (dir == 'v') {
-			{
+				html += '</tr>';
-				document.writeln('</tr>');
 			}
 		}
 
-		if (dir == 'h')
+		if (dir == 'h') {
-		{
+			html += '</tr>';
-			document.writeln('</tr>');
 		}
 	}
-	document.writeln('</table>');
+	html += '</table>';
+	return html;
 }
 
+(function($) {
+	$(document).ready(function() {
+		$('#color_palette_placeholder').each(function() {
+			$(this).html(colorPalette('h', 5, 10));
+		});
+	});
+})(jQuery);
+
+
 
 /**
 * Caret Position object
@@ -431,4 +436,4 @@ function getCaretPosition(txtarea)
 	}
 
 	return caretPos;
-}
+}

adm/style/portal/acp_portal_calendar.html

@@ -14,65 +14,51 @@
 <!-- ENDIF -->
 
 <!-- IF S_EDIT -->
-	<form id="acp_portal_links" method="post" action="{U_ACTION}">
+	<form id="acp_portal_links" method="post" action="{B3P_U_ACTION}">
 
 	<fieldset>
 		<legend>{L_ACP_PORTAL_EVENTS}</legend>
 	<dl>
-		<dt><label for="event_title">{L_EVENT_TITLE}:</label></dt>
+		<dt><label for="event_title">{L_EVENT_TITLE}{L_COLON}</label></dt>
 		<dd><input name="event_title" type="text" id="event_title" value="{EVENT_TITLE}" maxlength="255" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="event_desc">{L_EVENT_DESC}:</label></dt>
+		<dt><label for="event_desc">{L_EVENT_DESC}{L_COLON}</label></dt>
 		<dd><textarea id="event_desc" rows="6" cols="6" name="event_desc">{EVENT_DESC}</textarea></dd>
 	</dl>
 	<dl>
 		<dt>
-			<label for="event_start_day">{L_ACP_PORTAL_EVENT_START_DAY}:</label><br />
+			<label for="event_start_date">{L_ACP_PORTAL_EVENT_START_DATE}{L_COLON}</label><br />
-			<span>{L_ACP_PORTAL_EVENT_START_DAY_EXP}</span>
+			<span>{L_ACP_PORTAL_EVENT_START_DATE_EXP}</span>
 		</dt>
-		<dd><input name="event_start_day" type="text" id="event_start_day" value="{EVENT_START_DAY}" maxlength="255" /></dd>
+		<dd><input name="event_start_date" type="text" id="event_start_date" value="{EVENT_START_DATE}" maxlength="255" /></dd>
-	</dl>
-	<dl>	
-		<dt>
-			<label for="event_start_time">{L_ACP_PORTAL_EVENT_START_TIME}:</label><br />
-			<span>{L_ACP_PORTAL_EVENT_START_TIME_EXP}</span>
-		</dt>
-		<dd><input name="event_start_time" type="text" id="event_start_time" value="{EVENT_START_TIME}" maxlength="255" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="event_all_day">{L_EVENT_ALL_DAY}:</label></dt>
+		<dt><label for="event_all_day">{L_EVENT_ALL_DAY}{L_COLON}</label></dt>
 		<dd>
-			<label><input onchange="dE('end', -1)" type="radio" class="radio" name="event_all_day" value="1" id="event_all_day"<!-- IF EVENT_ALL_DAY --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
+			<label><input onchange="phpbb.toggleDisplay('end', -1)" type="radio" class="radio" name="event_all_day" value="1" id="event_all_day"<!-- IF EVENT_ALL_DAY --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
-			<label><input onchange="dE('end', 1)" type="radio" class="radio" name="event_all_day" value="0"<!-- IF not EVENT_ALL_DAY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+			<label><input onchange="phpbb.toggleDisplay('end', 1)" type="radio" class="radio" name="event_all_day" value="0"<!-- IF not EVENT_ALL_DAY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
 	<div id="end"<!-- IF EVENT_ALL_DAY -->style="display: none;"<!-- ENDIF -->>
 	<dl>
 		<dt>
-			<label for="event_end_day">{L_ACP_PORTAL_EVENT_END_DAY}:</label><br />
+			<label for="event_end_date">{L_ACP_PORTAL_EVENT_END_DATE}{L_COLON}</label><br />
-			<span>{L_ACP_PORTAL_EVENT_END_DAY_EXP}</span>
+			<span>{L_ACP_PORTAL_EVENT_END_DATE_EXP}</span>
 		</dt>
-		<dd><input name="event_end_day" type="text" id="event_end_day" value="{EVENT_END_DAY}" maxlength="255" /></dd>
+		<dd><input name="event_end_date" type="text" id="event_end_date" value="{EVENT_END_DATE}" maxlength="255" /></dd>
-	</dl>
-	<dl>
-		<dt>
-			<label for="event_end_time">{L_ACP_PORTAL_EVENT_END_TIME}:</label><br />
-			<span>{L_ACP_PORTAL_EVENT_END_TIME_EXP}</span>
-		</dt>
-		<dd><input name="event_end_time" type="text" id="event_end_time" value="{EVENT_END_TIME}" maxlength="255" /></dd>
 	</dl>
 	</div>
 	<dl>
 		<dt>
-			<label for="event_url">{L_EVENT_LINK}:</label><br />
+			<label for="event_url">{L_EVENT_LINK}{L_COLON}</label><br />
 			<span>{L_EVENT_LINK_EXP}</span>
 		</dt>
 		<dd><input name="event_url" type="text" id="event_url" value="{EVENT_URL}" maxlength="255" /></dd>
 	</dl>
 	<dl>
 		<dt>
-			<label for="permission-setting-calendar">{L_ACP_PORTAL_CALENDAR_PERMISSION}:</label><br />
+			<label for="permission-setting-calendar">{L_ACP_PORTAL_CALENDAR_PERMISSION}{L_COLON}</label><br />
 			<span>{L_ACP_PORTAL_CALENDAR_PERMISSION_EXP}</span>
 		</dt>
 		<dd>
@@ -99,40 +85,40 @@
 	<fieldset>
 		<legend>{L_MODULE_OPTIONS}</legend>
 		<dl>
-			<dt><label for="module_name">{L_MODULE_NAME}:</label><br /><span>{L_MODULE_NAME_EXP}</span></dt>
+			<dt><label for="module_name">{L_MODULE_NAME}{L_COLON}</label><br /><span>{L_MODULE_NAME_EXP}</span></dt>
 			<dd><input id="module_name" type="text" value="{MODULE_NAME}" name="module_name" maxlength="255" size="64" /></dd>
 		</dl>
 		<!-- IF MODULE_SHOW_IMAGE -->
 		<dl>
-			<dt><label for="module_image">{L_MODULE_IMAGE}:</label><br /><span>{L_MODULE_IMAGE_EXP}</span></dt>
+			<dt><label for="module_image">{L_MODULE_IMAGE}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_EXP}</span></dt>
 			<dd><input id="module_image" type="text" value="{MODULE_IMAGE}" name="module_image" maxlength="255" size="64" /></dd>
 			<!-- IF MODULE_IMAGE_SRC --><dd><img src="{MODULE_IMAGE_SRC}" alt="{L_MODULE_IMAGE}" /></dd><!-- ENDIF -->
 		</dl>
 		<!-- IF MODULE_IMAGE_SRC -->
 		<dl>
-			<dt><label for="module_img_width">{L_MODULE_IMAGE_WIDTH}:</label><br /><span>{L_MODULE_IMAGE_WIDTH_EXP}</span></dt>
+			<dt><label for="module_img_width">{L_MODULE_IMAGE_WIDTH}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_WIDTH_EXP}</span></dt>
 			<dd><input id="module_img_width" type="text" value="{MODULE_IMAGE_WIDTH}" name="module_img_width" maxlength="3" size="3" />px</dd>
 		</dl>
 		<dl>
-			<dt><label for="module_img_height">{L_MODULE_IMAGE_HEIGHT}:</label><br /><span>{L_MODULE_IMAGE_HEIGHT_EXP}</span></dt>
+			<dt><label for="module_img_height">{L_MODULE_IMAGE_HEIGHT}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_HEIGHT_EXP}</span></dt>
 			<dd><input id="module_img_height" type="text" value="{MODULE_IMAGE_HEIGHT}" name="module_img_height" maxlength="3" size="3" />px</dd>
 		</dl>
 		<!-- ENDIF -->
 		<!-- ENDIF -->
 		<dl>
-			<dt><label for="module_reset">{L_MODULE_RESET}:</label><br /><span style="color: #BC2A4D;">{L_MODULE_RESET_EXP}</span></dt>
+			<dt><label for="module_reset">{L_MODULE_RESET}{L_COLON}</label><br /><span style="color: #BC2A4D;">{L_MODULE_RESET_EXP}</span></dt>
 			<dd><input id="module_reset" type="checkbox" value="1" name="module_reset" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="module_status">{L_MODULE_STATUS}:</label></dt>
+			<dt><label for="module_status">{L_MODULE_STATUS}{L_COLON}</label></dt>
 			<dd>
 				<label><input type="radio" class="radio" name="module_status" value="1" id="module_status"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
 				<label><input type="radio" class="radio" name="module_status" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 			</dd>
 		</dl>
-		<!-- IF permission_setting -->
+		<!-- IF .permission_setting -->
 		<dl>
-			<dt><label for="permission-setting">{L_MODULE_PERMISSIONS}:</label><br /><span>{L_MODULE_PERMISSIONS_EXP}</span></dt>
+			<dt><label for="permission-setting">{L_MODULE_PERMISSIONS}{L_COLON}</label><br /><span>{L_MODULE_PERMISSIONS_EXP}</span></dt>
 			<dd>
 				<select id="permission-setting" size="10" multiple="multiple" name="permission-setting[]">
 					<!-- BEGIN permission_setting -->
@@ -154,7 +140,7 @@
 	<!-- ELSE -->
 
 		<dl>
-			<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+			<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 			<dd>{options.CONTENT}</dd>
 		</dl>
 
@@ -185,7 +171,7 @@
 		<!-- IF events.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 		<td style="text-align: center;">{events.EVENT_TITLE}</td>
 		<td style="text-align: center;">{events.EVENT_DESC}</td>
-		<td style="text-align: center;"><!-- IF events.EVENT_END -->{L_EVENT_START}:&nbsp;{events.EVENT_START}&nbsp;&#124;&nbsp;{L_EVENT_END}:&nbsp;{events.EVENT_END}<!-- ELSE -->{L_EVENT_TIME}:&nbsp;{events.EVENT_START}<!-- IF events.EVENT_ALL_DAY -->&nbsp;&#124;&nbsp;{L_EVENT_ALL_DAY}<!-- ENDIF --><!-- ENDIF --></td>
+		<td style="text-align: center;"><!-- IF events.EVENT_END -->{L_EVENT_START}{L_COLON}&nbsp;{events.EVENT_START}&nbsp;&#124;&nbsp;{L_EVENT_END}{L_COLON}&nbsp;{events.EVENT_END}<!-- ELSE -->{L_EVENT_TIME}{L_COLON}&nbsp;{events.EVENT_START}<!-- IF events.EVENT_ALL_DAY -->&nbsp;&#124;&nbsp;{L_EVENT_ALL_DAY}<!-- ENDIF --><!-- ENDIF --></td>
 		<td style="text-align: center;"><a href="{events.EVENT_URL}" alt="{events.EVENT_TITLE}">{events.EVENT_URL_RAW}</td>
 		<td style="text-align: center;">
 			<a href="{events.U_EDIT}">{ICON_EDIT}</a> <a href="{events.U_DELETE}">{ICON_DELETE}</a>

adm/style/portal/acp_portal_config.html

@@ -38,47 +38,47 @@
 		<!-- ENDIF -->
 	</fieldset>
 <!-- END mods -->
-<form id="acp_portal_config" method="post" action="{U_ACTION}">
+<form id="acp_portal_config" method="post" action="{B3P_U_ACTION}">
 <!-- IF SHOW_MODULE_OPTIONS -->
 		<fieldset>
 			<legend>{L_MODULE_OPTIONS}</legend>
 			<!-- IF MODULE_NAME -->
 			<dl>
-				<dt><label for="module_name">{L_MODULE_NAME}:</label><br /><span>{L_MODULE_NAME_EXP}</span></dt>
+				<dt><label for="module_name">{L_MODULE_NAME}{L_COLON}</label><br /><span>{L_MODULE_NAME_EXP}</span></dt>
 				<dd><input id="module_name" type="text" value="{MODULE_NAME}" name="module_name" maxlength="255" size="64" /></dd>
 			</dl>
 			<!-- ENDIF -->
 			<!-- IF MODULE_SHOW_IMAGE -->
 			<dl>
-				<dt><label for="module_image">{L_MODULE_IMAGE}:</label><br /><span>{L_MODULE_IMAGE_EXP}</span></dt>
+				<dt><label for="module_image">{L_MODULE_IMAGE}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_EXP}</span></dt>
 				<dd><input id="module_image" type="text" value="{MODULE_IMAGE}" name="module_image" maxlength="255" size="64" /></dd>
 				<!-- IF MODULE_IMAGE_SRC --><dd><img src="{MODULE_IMAGE_SRC}" alt="{L_MODULE_IMAGE}" /></dd><!-- ENDIF -->
 			</dl>
 			<!-- IF MODULE_IMAGE_SRC -->
 			<dl>
-				<dt><label for="module_img_width">{L_MODULE_IMAGE_WIDTH}:</label><br /><span>{L_MODULE_IMAGE_WIDTH_EXP}</span></dt>
+				<dt><label for="module_img_width">{L_MODULE_IMAGE_WIDTH}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_WIDTH_EXP}</span></dt>
 				<dd><input id="module_img_width" type="text" value="{MODULE_IMAGE_WIDTH}" name="module_img_width" maxlength="3" size="3" />px</dd>
 			</dl>
 			<dl>
-				<dt><label for="module_img_height">{L_MODULE_IMAGE_HEIGHT}:</label><br /><span>{L_MODULE_IMAGE_HEIGHT_EXP}</span></dt>
+				<dt><label for="module_img_height">{L_MODULE_IMAGE_HEIGHT}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_HEIGHT_EXP}</span></dt>
 				<dd><input id="module_img_height" type="text" value="{MODULE_IMAGE_HEIGHT}" name="module_img_height" maxlength="3" size="3" />px</dd>
 			</dl>
 			<!-- ENDIF -->
 			<!-- ENDIF -->
 			<dl>
-				<dt><label for="module_reset">{L_MODULE_RESET}:</label><br /><span style="color: #BC2A4D;">{L_MODULE_RESET_EXP}</span></dt>
+				<dt><label for="module_reset">{L_MODULE_RESET}{L_COLON}</label><br /><span style="color: #BC2A4D;">{L_MODULE_RESET_EXP}</span></dt>
 				<dd><input id="module_reset" type="checkbox" value="1" name="module_reset" /></dd>
 			</dl>
 			<dl>
-				<dt><label for="module_status">{L_MODULE_STATUS}:</label></dt>
+				<dt><label for="module_status">{L_MODULE_STATUS}{L_COLON}</label></dt>
 				<dd>
 					<label><input type="radio" class="radio" name="module_status" value="1" id="module_status"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
 					<label><input type="radio" class="radio" name="module_status" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 				</dd>
 			</dl>
-			<!-- IF permission_setting -->
+			<!-- IF .permission_setting -->
 			<dl>
-				<dt><label for="permission-setting">{L_MODULE_PERMISSIONS}:</label><br /><span>{L_MODULE_PERMISSIONS_EXP}</span></dt>
+				<dt><label for="permission-setting">{L_MODULE_PERMISSIONS}{L_COLON}</label><br /><span>{L_MODULE_PERMISSIONS_EXP}</span></dt>
 				<dd>
 					<select id="permission-setting" size="10" multiple="multiple" name="permission-setting[]">
 						<!-- BEGIN permission_setting -->
@@ -100,7 +100,7 @@
 	<!-- ELSE -->
 
 		<dl>
-			<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+			<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 			<dd>{options.CONTENT}</dd>
 		</dl>
 

adm/style/portal/acp_portal_custom.html

@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<script type="text/javascript" src="{ROOT_PATH}style/portal/acp_portal.js"></script>
+<!-- INCLUDEJS portal/acp_editor.js -->
 <script type="text/javascript">
 // <![CDATA[
 /**
@@ -53,6 +53,21 @@ var help_line = {
 	<!-- END custom_tags -->
 }
 
+function change_palette()
+{
+	phpbb.toggleDisplay('colour_palette');
+	e = document.getElementById('colour_palette');
+
+	if (e.style.display == 'block')
+	{
+		document.getElementById('bbpalette').value = '{LA_FONT_COLOR_HIDE}';
+	}
+	else
+	{
+		document.getElementById('bbpalette').value = '{LA_FONT_COLOR}';
+	}
+}
+
 // ]]>
 </script>
 
@@ -68,45 +83,45 @@ var help_line = {
 		<p>{ERROR_MSG}</p>
 	</div>
 <!-- ENDIF -->
-<form id="acp_portal_config" method="post" action="{U_ACTION}">
+<form id="acp_portal_config" method="post" action="{B3P_U_ACTION}">
 <!-- IF SHOW_MODULE_OPTIONS -->
 		<fieldset>
 			<legend>{L_MODULE_OPTIONS}</legend>
 			<dl>
-				<dt><label for="module_name">{L_MODULE_NAME}:</label><br /><span>{L_MODULE_NAME_EXP}</span></dt>
+				<dt><label for="module_name">{L_MODULE_NAME}{L_COLON}</label><br /><span>{L_MODULE_NAME_EXP}</span></dt>
 				<dd><input id="module_name" type="text" value="{MODULE_NAME}" name="module_name" maxlength="255" size="64" /></dd>
 			</dl>
 			<!-- IF MODULE_SHOW_IMAGE -->
 			<dl>
-				<dt><label for="module_image">{L_MODULE_IMAGE}:</label><br /><span>{L_MODULE_IMAGE_EXP}</span></dt>
+				<dt><label for="module_image">{L_MODULE_IMAGE}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_EXP}</span></dt>
 				<dd><input id="module_image" type="text" value="{MODULE_IMAGE}" name="module_image" maxlength="255" size="64" /></dd>
 				<!-- IF MODULE_IMAGE_SRC --><dd><img src="{MODULE_IMAGE_SRC}" alt="{L_MODULE_IMAGE}" /></dd><!-- ENDIF -->
 			</dl>
 			<!-- IF MODULE_IMAGE_SRC -->
 			<dl>
-				<dt><label for="module_img_width">{L_MODULE_IMAGE_WIDTH}:</label><br /><span>{L_MODULE_IMAGE_WIDTH_EXP}</span></dt>
+				<dt><label for="module_img_width">{L_MODULE_IMAGE_WIDTH}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_WIDTH_EXP}</span></dt>
 				<dd><input id="module_img_width" type="text" value="{MODULE_IMAGE_WIDTH}" name="module_img_width" maxlength="3" size="3" />px</dd>
 			</dl>
 			<dl>
-				<dt><label for="module_img_height">{L_MODULE_IMAGE_HEIGHT}:</label><br /><span>{L_MODULE_IMAGE_HEIGHT_EXP}</span></dt>
+				<dt><label for="module_img_height">{L_MODULE_IMAGE_HEIGHT}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_HEIGHT_EXP}</span></dt>
 				<dd><input id="module_img_height" type="text" value="{MODULE_IMAGE_HEIGHT}" name="module_img_height" maxlength="3" size="3" />px</dd>
 			</dl>
 			<!-- ENDIF -->
 			<!-- ENDIF -->
 			<dl>
-				<dt><label for="module_reset">{L_MODULE_RESET}:</label><br /><span style="color: #BC2A4D;">{L_MODULE_RESET_EXP}</span></dt>
+				<dt><label for="module_reset">{L_MODULE_RESET}{L_COLON}</label><br /><span style="color: #BC2A4D;">{L_MODULE_RESET_EXP}</span></dt>
 				<dd><input id="module_reset" type="checkbox" value="1" name="module_reset" /></dd>
 			</dl>
 			<dl>
-				<dt><label for="module_status">{L_MODULE_STATUS}:</label></dt>
+				<dt><label for="module_status">{L_MODULE_STATUS}{L_COLON}</label></dt>
 				<dd>
 					<label><input type="radio" class="radio" name="module_status" value="1" id="module_status"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
 					<label><input type="radio" class="radio" name="module_status" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 				</dd>
 			</dl>
-			<!-- IF permission_setting -->
+			<!-- IF .permission_setting -->
 			<dl>
-				<dt><label for="permission-setting">{L_ACP_PORTAL_CUSTOM_PERMISSION}:</label><br /><span>{L_ACP_PORTAL_CUSTOM_PERMISSION_EXP}</span></dt>
+				<dt><label for="permission-setting">{L_ACP_PORTAL_CUSTOM_PERMISSION}{L_COLON}</label><br /><span>{L_ACP_PORTAL_CUSTOM_PERMISSION_EXP}</span></dt>
 				<dd>
 					<select id="permission-setting" size="10" multiple="multiple" name="permission-setting[]">
 						<!-- BEGIN permission_setting -->
@@ -131,41 +146,16 @@ var help_line = {
 		<fieldset>
 			<legend>{L_PORTAL_CUSTOM}</legend>
 		<dl id="bbcode-buttons"<!-- IF not CUSTOM_USE_BBCODE --> style="display: none;"<!-- ENDIF -->>
+			<dt></dt>
 			<dd>
 				<div id="colour_palette" style="display: none;">
 					<dl style="clear: left;">
-						<dt style="border: none;"><label>{L_FONT_COLOR}:</label><br /></dt>
+						<dt style="border: none;"><label>{L_FONT_COLOR}{L_COLON}</label></dt>
+						<dd></dd>
 					</dl>
 					<dl style="clear: left;">
-					<dt style="border: none;">
+						<dt id="color_palette_placeholder" style="border: none;"></dt>
-						<script type="text/javascript">
+						<dd></dd>
-						// <![CDATA[
-							function change_palette()
-							{
-								e = document.getElementById('colour_palette');
-								if(e.style.display == 'block')
-								{
-									dE('colour_palette', -1);
-								}
-								else
-								{
-									dE('colour_palette', 1);
-								}
-
-								if (e.style.display == 'block')
-								{
-									document.getElementById('bbpalette').value = '{LA_FONT_COLOR_HIDE}';
-								}
-								else
-								{
-									document.getElementById('bbpalette').value = '{LA_FONT_COLOR}';
-								}
-							}
-
-							colorPalette('h', 10, 5);
-						// ]]>
-						</script>
-					</dt>
 					</dl>
 				</div>
 				<div id="format-buttons">
@@ -208,7 +198,7 @@ var help_line = {
 		</dl>
 		<dl>
 			<dt>
-				<label for="custom_code">{L_ACP_PORTAL_CUSTOM_CODE}:</label><br />
+				<label for="custom_code">{L_ACP_PORTAL_CUSTOM_CODE}{L_COLON}</label><br />
 				<span>{L_ACP_PORTAL_CUSTOM_CODE_EXP}</span>
 			</dt>
 			<dd><textarea name="custom_code" id="custom_code" cols="6" rows="12">{CUSTOM_CODE}</textarea></dd>
@@ -219,8 +209,8 @@ var help_line = {
 				<span>{L_ACP_PORTAL_CUSTOM_BBCODE_EXP}</span>
 			</dt>
 			<dd>
-				<label><input onchange="dE('bbcode-buttons', 1)" class="radio" type="radio" value="1" name="custom_use_bbcode" id="custom_use_bbcode"<!-- IF CUSTOM_USE_BBCODE --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
+				<label><input onchange="phpbb.toggleDisplay('bbcode-buttons', 1)" class="radio" type="radio" value="1" name="custom_use_bbcode" id="custom_use_bbcode"<!-- IF CUSTOM_USE_BBCODE --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
-				<label><input onchange="dE('bbcode-buttons', -1)" class="radio" type="radio" value="0" name="custom_use_bbcode"<!-- IF not CUSTOM_USE_BBCODE --> checked="checked"<!-- ENDIF --> />{L_NO}</label>
+				<label><input onchange="phpbb.toggleDisplay('bbcode-buttons', -1)" class="radio" type="radio" value="0" name="custom_use_bbcode"<!-- IF not CUSTOM_USE_BBCODE --> checked="checked"<!-- ENDIF --> />{L_NO}</label>
 			</dd>
 		</dl>
 <!-- IF S_AUTH -->

adm/style/portal/acp_portal_links.html

@@ -14,17 +14,17 @@
 <!-- ENDIF -->
 
 <!-- IF S_EDIT -->
-	<form id="acp_portal_links" method="post" action="{U_ACTION}">
+	<form id="acp_portal_links" method="post" action="{B3P_U_ACTION}">
 
 	<fieldset>
 		<legend>{L_ACP_PORTAL_LINKS}</legend>
 	<dl>
-		<dt><label for="link_title">{L_ACP_PORTAL_LINK_TITLE}:</label></dt>
+		<dt><label for="link_title">{L_ACP_PORTAL_LINK_TITLE}{L_COLON}</label></dt>
 		<dd><input name="link_title" type="text" id="link_title" value="{LINK_TITLE}" maxlength="255" /></dd>
 	</dl>
 	<dl>
 		<dt>
-			<label for="link_type">{L_ACP_PORTAL_LINK_TYPE}:</label><br />
+			<label for="link_type">{L_ACP_PORTAL_LINK_TYPE}{L_COLON}</label><br />
 			<span>{L_ACP_PORTAL_LINK_TYPE_EXP}</span>
 		</dt>
 		<dd>
@@ -34,14 +34,14 @@
 	</dl>
 	<dl>
 		<dt>
-			<label for="link_url">{L_ACP_PORTAL_LINK_URL}:</label><br />
+			<label for="link_url">{L_ACP_PORTAL_LINK_URL}{L_COLON}</label><br />
 			<span>{L_ACP_PORTAL_LINK_URL_EXP}</span>
 		</dt>
 		<dd><input name="link_url" type="text" id="link_url" value="{LINK_URL}" maxlength="255" /></dd>
 	</dl>
 	<dl>
 		<dt>
-			<label for="permission-setting-link">{L_ACP_PORTAL_LINK_PERMISSION}:</label><br />
+			<label for="permission-setting-link">{L_ACP_PORTAL_LINK_PERMISSION}{L_COLON}</label><br />
 			<span>{L_ACP_PORTAL_LINK_PERMISSION_EXP}</span>
 		</dt>
 		<dd>
@@ -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}" />
@@ -68,40 +69,40 @@
 	<fieldset>
 		<legend>{L_MODULE_OPTIONS}</legend>
 		<dl>
-			<dt><label for="module_name">{L_MODULE_NAME}:</label><br /><span>{L_MODULE_NAME_EXP}</span></dt>
+			<dt><label for="module_name">{L_MODULE_NAME}{L_COLON}</label><br /><span>{L_MODULE_NAME_EXP}</span></dt>
 			<dd><input id="module_name" type="text" value="{MODULE_NAME}" name="module_name" maxlength="255" size="64" /></dd>
 		</dl>
 		<!-- IF MODULE_SHOW_IMAGE -->
 		<dl>
-			<dt><label for="module_image">{L_MODULE_IMAGE}:</label><br /><span>{L_MODULE_IMAGE_EXP}</span></dt>
+			<dt><label for="module_image">{L_MODULE_IMAGE}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_EXP}</span></dt>
 			<dd><input id="module_image" type="text" value="{MODULE_IMAGE}" name="module_image" maxlength="255" size="64" /></dd>
 			<!-- IF MODULE_IMAGE_SRC --><dd><img src="{MODULE_IMAGE_SRC}" alt="{L_MODULE_IMAGE}" /></dd><!-- ENDIF -->
 		</dl>
 		<!-- IF MODULE_IMAGE_SRC -->
 		<dl>
-			<dt><label for="module_img_width">{L_MODULE_IMAGE_WIDTH}:</label><br /><span>{L_MODULE_IMAGE_WIDTH_EXP}</span></dt>
+			<dt><label for="module_img_width">{L_MODULE_IMAGE_WIDTH}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_WIDTH_EXP}</span></dt>
 			<dd><input id="module_img_width" type="text" value="{MODULE_IMAGE_WIDTH}" name="module_img_width" maxlength="3" size="3" />px</dd>
 		</dl>
 		<dl>
-			<dt><label for="module_img_height">{L_MODULE_IMAGE_HEIGHT}:</label><br /><span>{L_MODULE_IMAGE_HEIGHT_EXP}</span></dt>
+			<dt><label for="module_img_height">{L_MODULE_IMAGE_HEIGHT}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_HEIGHT_EXP}</span></dt>
 			<dd><input id="module_img_height" type="text" value="{MODULE_IMAGE_HEIGHT}" name="module_img_height" maxlength="3" size="3" />px</dd>
 		</dl>
 		<!-- ENDIF -->
 		<!-- ENDIF -->
 		<dl>
-			<dt><label for="module_reset">{L_MODULE_RESET}:</label><br /><span style="color: #BC2A4D;">{L_MODULE_RESET_EXP}</span></dt>
+			<dt><label for="module_reset">{L_MODULE_RESET}{L_COLON}</label><br /><span style="color: #BC2A4D;">{L_MODULE_RESET_EXP}</span></dt>
 			<dd><input id="module_reset" type="checkbox" value="1" name="module_reset" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="module_status">{L_MODULE_STATUS}:</label></dt>
+			<dt><label for="module_status">{L_MODULE_STATUS}{L_COLON}</label></dt>
 			<dd>
 				<label><input type="radio" class="radio" name="module_status" value="1" id="module_status"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
 				<label><input type="radio" class="radio" name="module_status" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 			</dd>
 		</dl>
-		<!-- IF permission_setting -->
+		<!-- IF .permission_setting -->
 		<dl>
-			<dt><label for="permission-setting">{L_MODULE_PERMISSIONS}:</label><br /><span>{L_MODULE_PERMISSIONS_EXP}</span></dt>
+			<dt><label for="permission-setting">{L_MODULE_PERMISSIONS}{L_COLON}</label><br /><span>{L_MODULE_PERMISSIONS_EXP}</span></dt>
 			<dd>
 				<select id="permission-setting" size="10" multiple="multiple" name="permission-setting[]">
 					<!-- BEGIN permission_setting -->
@@ -123,7 +124,7 @@
 	<!-- ELSE -->
 
 		<dl>
-			<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+			<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 			<dd>{options.CONTENT}</dd>
 		</dl>
 

adm/style/portal/acp_portal_menu.html

@@ -14,23 +14,23 @@
 <!-- ENDIF -->
 
 <!-- IF S_EDIT -->
-	<form id="acp_portal_links" method="post" action="{U_ACTION}">
+	<form id="acp_portal_links" method="post" action="{B3P_U_ACTION}">
 
 	<fieldset>
 		<legend>{L_ACP_PORTAL_MENU_LINK_SETTINGS}</legend>
 	<dl>
-		<dt><label for="link_title">{L_ACP_PORTAL_MENU_TITLE}:</label></dt>
+		<dt><label for="link_title">{L_ACP_PORTAL_MENU_TITLE}{L_COLON}</label></dt>
 		<dd><input name="link_title" type="text" id="link_title" value="{LINK_TITLE}" maxlength="255" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="link_is_cat">{L_ACP_PORTAL_MENU_IS_CAT}:</label></dt>
+		<dt><label for="link_is_cat">{L_ACP_PORTAL_MENU_IS_CAT}{L_COLON}</label></dt>
-		<dd><label><input onchange="dE('url', -1)" type="radio" class="radio" name="link_is_cat" value="1" id="link_is_cat"<!-- IF S_LINK_IS_CAT --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
+		<dd><label><input onchange="phpbb.toggleDisplay('url', -1)" type="radio" class="radio" name="link_is_cat" value="1" id="link_is_cat"<!-- IF S_LINK_IS_CAT --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
-			<label><input onchange="dE('url', 1)" type="radio" class="radio" name="link_is_cat" value="0"<!-- IF not S_LINK_IS_CAT --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<label><input onchange="phpbb.toggleDisplay('url', 1)" type="radio" class="radio" name="link_is_cat" value="0"<!-- IF not S_LINK_IS_CAT --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<div id="url"<!-- IF S_LINK_IS_CAT --> style="display: none;"<!-- ENDIF -->>
 	<dl>
 		<dt>
-			<label for="link_type">{L_ACP_PORTAL_MENU_TYPE}:</label><br />
+			<label for="link_type">{L_ACP_PORTAL_MENU_TYPE}{L_COLON}</label><br />
 			<span>{L_ACP_PORTAL_MENU_TYPE_EXP}</span>
 		</dt>
 		<dd>
@@ -40,14 +40,14 @@
 	</dl>
 	<dl>
 		<dt>
-			<label for="link_url">{L_ACP_PORTAL_MENU_URL}:</label><br />
+			<label for="link_url">{L_ACP_PORTAL_MENU_URL}{L_COLON}</label><br />
 			<span>{L_ACP_PORTAL_MENU_URL_EXP}</span>
 		</dt>
 		<dd><input name="link_url" type="text" id="link_url" value="{LINK_URL}" maxlength="255" /></dd>
 	</dl>
 	<dl>
 		<dt>
-			<label for="permission-setting-menu">{L_ACP_PORTAL_MENU_PERMISSION}:</label><br />
+			<label for="permission-setting-menu">{L_ACP_PORTAL_MENU_PERMISSION}{L_COLON}</label><br />
 			<span>{L_ACP_PORTAL_MENU_PERMISSION_EXP}</span>
 		</dt>
 		<dd>
@@ -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}" />
@@ -75,40 +76,40 @@
 	<fieldset>
 		<legend>{L_MODULE_OPTIONS}</legend>
 		<dl>
-			<dt><label for="module_name">{L_MODULE_NAME}:</label><br /><span>{L_MODULE_NAME_EXP}</span></dt>
+			<dt><label for="module_name">{L_MODULE_NAME}{L_COLON}</label><br /><span>{L_MODULE_NAME_EXP}</span></dt>
 			<dd><input id="module_name" type="text" value="{MODULE_NAME}" name="module_name" maxlength="255" size="64" /></dd>
 		</dl>
 		<!-- IF MODULE_SHOW_IMAGE -->
 		<dl>
-			<dt><label for="module_image">{L_MODULE_IMAGE}:</label><br /><span>{L_MODULE_IMAGE_EXP}</span></dt>
+			<dt><label for="module_image">{L_MODULE_IMAGE}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_EXP}</span></dt>
 			<dd><input id="module_image" type="text" value="{MODULE_IMAGE}" name="module_image" maxlength="255" size="64" /></dd>
 			<!-- IF MODULE_IMAGE_SRC --><dd><img src="{MODULE_IMAGE_SRC}" alt="{L_MODULE_IMAGE}" /></dd><!-- ENDIF -->
 		</dl>
 		<!-- IF MODULE_IMAGE_SRC -->
 		<dl>
-			<dt><label for="module_img_width">{L_MODULE_IMAGE_WIDTH}:</label><br /><span>{L_MODULE_IMAGE_WIDTH_EXP}</span></dt>
+			<dt><label for="module_img_width">{L_MODULE_IMAGE_WIDTH}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_WIDTH_EXP}</span></dt>
 			<dd><input id="module_img_width" type="text" value="{MODULE_IMAGE_WIDTH}" name="module_img_width" maxlength="3" size="3" />px</dd>
 		</dl>
 		<dl>
-			<dt><label for="module_img_height">{L_MODULE_IMAGE_HEIGHT}:</label><br /><span>{L_MODULE_IMAGE_HEIGHT_EXP}</span></dt>
+			<dt><label for="module_img_height">{L_MODULE_IMAGE_HEIGHT}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_HEIGHT_EXP}</span></dt>
 			<dd><input id="module_img_height" type="text" value="{MODULE_IMAGE_HEIGHT}" name="module_img_height" maxlength="3" size="3" />px</dd>
 		</dl>
 		<!-- ENDIF -->
 		<!-- ENDIF -->
 		<dl>
-			<dt><label for="module_reset">{L_MODULE_RESET}:</label><br /><span style="color: #BC2A4D;">{L_MODULE_RESET_EXP}</span></dt>
+			<dt><label for="module_reset">{L_MODULE_RESET}{L_COLON}</label><br /><span style="color: #BC2A4D;">{L_MODULE_RESET_EXP}</span></dt>
 			<dd><input id="module_reset" type="checkbox" value="1" name="module_reset" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="module_status">{L_MODULE_STATUS}:</label></dt>
+			<dt><label for="module_status">{L_MODULE_STATUS}{L_COLON}</label></dt>
 			<dd>
 				<label><input type="radio" class="radio" name="module_status" value="1" id="module_status"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
 				<label><input type="radio" class="radio" name="module_status" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 			</dd>
 		</dl>
-		<!-- IF permission_setting -->
+		<!-- IF .permission_setting -->
 		<dl>
-			<dt><label for="permission-setting">{L_MODULE_PERMISSIONS}:</label><br /><span>{L_MODULE_PERMISSIONS_EXP}</span></dt>
+			<dt><label for="permission-setting">{L_MODULE_PERMISSIONS}{L_COLON}</label><br /><span>{L_MODULE_PERMISSIONS_EXP}</span></dt>
 			<dd>
 				<select id="permission-setting" size="10" multiple="multiple" name="permission-setting[]">
 					<!-- BEGIN permission_setting -->
@@ -130,7 +131,7 @@
 	<!-- ELSE -->
 
 		<dl>
-			<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+			<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 			<dd>{options.CONTENT}</dd>
 		</dl>
 

adm/style/portal/acp_portal_modules.html

@@ -1,16 +1,34 @@
+<!-- IF S_AJAX_REQUEST -->
+	<form id="acp_portal_modules" method="post" action="{U_ACTION}">
+		<fieldset>
+			<dl>
+				<dt><label for="module_classname" style="display: inline;">{L_CHOOSE_MODULE}{L_COLON}</label><br /><span>{L_CHOOSE_MODULE_EXP}</span></dt>
+				<dd><select name="module_classname" id="module_classname">{S_MODULE_NAMES}</select></dd>
+			</dl>
+
+			<p class="submit-buttons">
+				<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}" />
+				{S_FORM_TOKEN}{S_HIDDEN_FIELDS}
+			</p>
+		</fieldset>
+	</form>
+
+<!-- ELSE -->
+<!-- INCLUDECSS portal/b3p_admin.css -->
 <!-- INCLUDE overall_header.html -->
 
 <a name="maincontent"></a>
 
 <!-- IF S_EDIT -->
+
 <h1>{L_ACP_PORTAL_MODULES}</h1>
 <p>{L_ACP_PORTAL_MODULES_EXP}</p>
 
-<form id="acp_portal_modules" method="post" action="{U_ACTION}">
+<form id="acp_portal_modules" method="post" action="{B3P_U_ACTION}">
 	<fieldset>
-		<legend>{L_GENERAL_OPTIONS}</legend>
 		<dl>
-			<dt><label for="module_classname">{L_CHOOSE_MODULE}:</label><br /><span>{L_CHOOSE_MODULE_EXP}</span></dt>
+			<dt><label for="module_classname">{L_CHOOSE_MODULE}{L_COLON}</label><br /><span>{L_CHOOSE_MODULE_EXP}</span></dt>
 			<dd><select name="module_classname" id="module_classname">{S_MODULE_NAMES}</select></dd>
 		</dl>
 
@@ -27,22 +45,24 @@
 <h1>{L_ACP_PORTAL_MODULES}</h1>
 <p>{L_ACP_PORTAL_MODULES_EXP}</p>
 
-<form id="acp_portal_modules" method="post" action="{U_ACTION}">
+<form id="acp_portal_modules" method="post" action="{U_ACTION}" data-ajax="true">
 	<fieldset class="tabulated">
 	<legend>{L_ACP_PORTAL_MODULES}</legend>
 
-	<table cellspacing="1">
+	<table class="portal-modules-overview">
 		<tr>
-			<th style="text-align: center;" colspan="3">{L_MODULE_POS_TOP}</th>
+			<th style="text-align: center;">{L_MODULE_POS_TOP}</th>
 		</tr>
 		<!-- BEGIN modules_top -->
 			<!-- IF not modules_top.MODULE_ENABLED --><tr class="row3"><!-- ELSEIF modules_top.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-				<td colspan="3">
+				<td>
 					{modules_top.MODULE_IMAGE} {modules_top.MODULE_NAME}<br />
 					<br />
-					<!-- IF modules_top.S_FIRST_ROW -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{modules_top.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF -->&nbsp;
+					<span<!-- IF not modules_top.S_FIRST_ROW --> style="display: none;"<!-- ENDIF -->>{ICON_MOVE_UP_DISABLED}&nbsp;</span>
-					<!-- IF modules_top.S_LAST_ROW -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{modules_top.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF -->&nbsp;
+					<span<!-- IF modules_top.S_FIRST_ROW --> style="display: none;"<!-- ENDIF -->><a href="{modules_top.U_MOVE_UP}" data-ajax="b3p_move_module_up">{ICON_MOVE_UP}</a>&nbsp;</span>
-					<a href="{modules_top.U_EDIT}">{ICON_EDIT}</a> <a href="{modules_top.U_DELETE}">{ICON_DELETE}</a>
+					<span<!-- IF not modules_top.S_LAST_ROW --> style="display: none;"<!-- ENDIF -->>{ICON_MOVE_DOWN_DISABLED}&nbsp;</span>
+					<span<!-- IF modules_top.S_LAST_ROW --> style="display: none;"<!-- ENDIF -->><a href="{modules_top.U_MOVE_DOWN}" data-ajax="b3p_move_module_down">{ICON_MOVE_DOWN}</a>&nbsp;</span>
+					<a href="{modules_top.U_EDIT}">{ICON_EDIT}</a> <a href="{modules_top.U_DELETE}" data-ajax="b3p_delete_module">{ICON_DELETE}</a>
 				</td>
 			</tr>
 		<!-- BEGINELSE -->
@@ -58,7 +78,7 @@
 	<table style="background-color: transparent; border: none; padding: 0px; margin: 0px;">
 		<tr style="vertical-align: top;">
 				<td style="width: 20%; font-size: 100%; line-height: 100%; padding: 0px; margin: 0px;">
-	<table cellspacing="1">
+	<table class="portal-modules-overview">
 		<tr>
 				<th>{L_MODULE_POS_LEFT}</th>
 		</tr>
@@ -67,11 +87,13 @@
 				<td>
 					{modules_left.MODULE_IMAGE} {modules_left.MODULE_NAME}<br />
 					<br />
-					<!-- IF modules_left.S_FIRST_ROW -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{modules_left.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF -->&nbsp;
+					<span<!-- IF not modules_left.S_FIRST_ROW --> style="display: none;"<!-- ENDIF -->>{ICON_MOVE_UP_DISABLED}&nbsp;</span>
+					<span<!-- IF modules_left.S_FIRST_ROW --> style="display: none;"<!-- ENDIF -->><a href="{modules_left.U_MOVE_UP}" data-ajax="b3p_move_module_up">{ICON_MOVE_UP}</a>&nbsp;</span>
 					<!-- IF modules_left.U_MOVE_RIGHT --><a href="{modules_left.U_MOVE_RIGHT}"><!-- IF S_CONTENT_DIRECTION eq 'rtl' -->{ICON_MOVE_LEFT}<!-- ELSE -->{ICON_MOVE_RIGHT}<!-- ENDIF --></a><!-- ELSE --><!-- IF S_CONTENT_DIRECTION eq 'rtl' -->{ICON_MOVE_LEFT_DISABLED}<!-- ELSE -->{ICON_MOVE_RIGHT_DISABLED}<!-- ENDIF --><!-- ENDIF -->&nbsp;
-					<a href="{modules_left.U_EDIT}">{ICON_EDIT}</a> <a href="{modules_left.U_DELETE}">{ICON_DELETE}</a><br />
+					<a href="{modules_left.U_EDIT}">{ICON_EDIT}</a> <a href="{modules_left.U_DELETE}" data-ajax="b3p_delete_module">{ICON_DELETE}</a><br />
 					<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->{ICON_MOVE_RIGHT_DISABLED}<!-- ELSE -->{ICON_MOVE_LEFT_DISABLED}<!-- ENDIF -->&nbsp;
-					<!-- IF modules_left.S_LAST_ROW -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{modules_left.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF -->
+					<span<!-- IF not modules_left.S_LAST_ROW --> style="display: none;"<!-- ENDIF -->>{ICON_MOVE_DOWN_DISABLED}&nbsp;</span>
+					<span<!-- IF modules_left.S_LAST_ROW --> style="display: none;"<!-- ENDIF -->><a href="{modules_left.U_MOVE_DOWN}" data-ajax="b3p_move_module_down">{ICON_MOVE_DOWN}</a></span>
 				</td>
 			</tr>
 		<!-- BEGINELSE -->
@@ -85,7 +107,7 @@
 	</p>
 				</td>
 				<td style="font-size: 100%; line-height: 100%; padding: 0 12px;">
-	<table cellspacing="1">
+	<table class="portal-modules-overview">
 		<tr>
 				<th style="text-align: center;">{L_MODULE_POS_CENTER}</th>
 		</tr>
@@ -94,11 +116,13 @@
 				<td>
 					{modules_center.MODULE_IMAGE} {modules_center.MODULE_NAME}<br />
 					<br />
-					<!-- IF modules_center.S_FIRST_ROW -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{modules_center.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF -->&nbsp;
+					<span<!-- IF not modules_center.S_FIRST_ROW --> style="display: none;"<!-- ENDIF -->>{ICON_MOVE_UP_DISABLED}&nbsp;</span>
+					<span<!-- IF modules_center.S_FIRST_ROW --> style="display: none;"<!-- ENDIF -->><a href="{modules_center.U_MOVE_UP}" data-ajax="b3p_move_module_up">{ICON_MOVE_UP}</a>&nbsp;</span>
 					<!-- IF modules_center.U_MOVE_RIGHT --><a href="{modules_center.U_MOVE_RIGHT}">{ICON_MOVE_RIGHT}</a><!-- ELSE -->{ICON_MOVE_RIGHT_DISABLED}<!-- ENDIF -->&nbsp;
-					<a href="{modules_center.U_EDIT}">{ICON_EDIT}</a> <a href="{modules_center.U_DELETE}">{ICON_DELETE}</a><br />
+					<a href="{modules_center.U_EDIT}">{ICON_EDIT}</a> <a href="{modules_center.U_DELETE}" data-ajax="b3p_delete_module">{ICON_DELETE}</a><br />
 					<!-- IF modules_center.U_MOVE_LEFT --><a href="{modules_center.U_MOVE_LEFT}">{ICON_MOVE_LEFT}</a><!-- ELSE -->{ICON_MOVE_LEFT_DISABLED}<!-- ENDIF -->&nbsp;
-					<!-- IF modules_center.S_LAST_ROW -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{modules_center.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF -->
+					<span<!-- IF not modules_center.S_LAST_ROW --> style="display: none;"<!-- ENDIF -->>{ICON_MOVE_DOWN_DISABLED}&nbsp;</span>
+					<span<!-- IF modules_center.S_LAST_ROW --> style="display: none;"<!-- ENDIF -->><a href="{modules_center.U_MOVE_DOWN}" data-ajax="b3p_move_module_down">{ICON_MOVE_DOWN}</a></span>
 				</td>
 			</tr>
 		<!-- BEGINELSE -->
@@ -112,7 +136,7 @@
 	</p>
 				</td>
 				<td style="width: 20%; font-size: 100%; line-height: 100%; padding: 0px;">
-	<table cellspacing="1">
+	<table class="portal-modules-overview">
 		<tr>
 				<th>{L_MODULE_POS_RIGHT}</th>
 		</tr>
@@ -121,11 +145,13 @@
 				<td>
 					{modules_right.MODULE_IMAGE} {modules_right.MODULE_NAME}<br />
 					<br />
-					<!-- IF modules_right.S_FIRST_ROW -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{modules_right.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF -->&nbsp;
+					<span<!-- IF not modules_right.S_FIRST_ROW --> style="display: none;"<!-- ENDIF -->>{ICON_MOVE_UP_DISABLED}&nbsp;</span>
+					<span<!-- IF modules_right.S_FIRST_ROW --> style="display: none;"<!-- ENDIF -->><a href="{modules_right.U_MOVE_UP}" data-ajax="b3p_move_module_up">{ICON_MOVE_UP}</a>&nbsp;</span>
 					<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->{ICON_MOVE_LEFT_DISABLED}<!-- ELSE -->{ICON_MOVE_RIGHT_DISABLED}<!-- ENDIF -->&nbsp;
-					<a href="{modules_right.U_EDIT}">{ICON_EDIT}</a> <a href="{modules_right.U_DELETE}">{ICON_DELETE}</a><br />
+					<a href="{modules_right.U_EDIT}">{ICON_EDIT}</a> <a href="{modules_right.U_DELETE}" data-ajax="b3p_delete_module">{ICON_DELETE}</a><br />
 					<!-- IF modules_right.U_MOVE_LEFT --><a href="{modules_right.U_MOVE_LEFT}"><!-- IF S_CONTENT_DIRECTION eq 'rtl' -->{ICON_MOVE_RIGHT}<!-- ELSE -->{ICON_MOVE_LEFT}<!-- ENDIF --></a><!-- ELSE --><!-- IF S_CONTENT_DIRECTION eq 'rtl' -->{ICON_MOVE_RIGHT_DISABLED}<!-- ELSE -->{ICON_MOVE_LEFT_DISABLED}<!-- ENDIF --><!-- ENDIF -->&nbsp;
-					<!-- IF modules_right.S_LAST_ROW -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{modules_right.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF -->
+					<span<!-- IF not modules_right.S_LAST_ROW --> style="display: none;"<!-- ENDIF -->>{ICON_MOVE_DOWN_DISABLED}&nbsp;</span>
+					<span<!-- IF modules_right.S_LAST_ROW --> style="display: none;"<!-- ENDIF -->><a href="{modules_right.U_MOVE_DOWN}" data-ajax="b3p_move_module_down">{ICON_MOVE_DOWN}</a></span>
 				</td>
 			</tr>
 		<!-- BEGINELSE -->
@@ -142,18 +168,20 @@
 	</table>
 	<br />
 
-	<table cellspacing="1">
+	<table class="portal-modules-overview">
 		<tr>
-			<th style="text-align: center;" colspan="3">{L_MODULE_POS_BOTTOM}</th>
+			<th style="text-align: center;">{L_MODULE_POS_BOTTOM}</th>
 		</tr>
 		<!-- BEGIN modules_bottom -->
 			<!-- IF not modules_bottom.MODULE_ENABLED --><tr class="row3"><!-- ELSEIF modules_bottom.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-				<td colspan="3">
+				<td>
 					{modules_bottom.MODULE_IMAGE} {modules_bottom.MODULE_NAME}<br />
 					<br />
-					<!-- IF modules_bottom.S_FIRST_ROW -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{modules_bottom.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF -->&nbsp;
+					<span<!-- IF not modules_bottom.S_FIRST_ROW --> style="display: none;"<!-- ENDIF -->>{ICON_MOVE_UP_DISABLED}&nbsp;</span>
-					<!-- IF modules_bottom.S_LAST_ROW -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{modules_bottom.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF -->&nbsp;
+					<span<!-- IF modules_bottom.S_FIRST_ROW --> style="display: none;"<!-- ENDIF -->><a href="{modules_bottom.U_MOVE_UP}" data-ajax="b3p_move_module_up">{ICON_MOVE_UP}</a>&nbsp;</span>
-					<a href="{modules_bottom.U_EDIT}">{ICON_EDIT}</a> <a href="{modules_bottom.U_DELETE}">{ICON_DELETE}</a>
+					<span<!-- IF not modules_bottom.S_LAST_ROW --> style="display: none;"<!-- ENDIF -->>{ICON_MOVE_DOWN_DISABLED}&nbsp;</span>
+					<span<!-- IF modules_bottom.S_LAST_ROW --> style="display: none;"<!-- ENDIF -->><a href="{modules_bottom.U_MOVE_DOWN}" data-ajax="b3p_move_module_down">{ICON_MOVE_DOWN}</a>&nbsp;</span>
+					<a href="{modules_bottom.U_EDIT}">{ICON_EDIT}</a> <a href="{modules_bottom.U_DELETE}" data-ajax="b3p_delete_module">{ICON_DELETE}</a>
 				</td>
 			</tr>
 		<!-- BEGINELSE -->
@@ -172,4 +200,7 @@
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDEJS portal/ajax.js -->
+
+<!-- INCLUDE overall_footer.html -->
+<!-- ENDIF -->

adm/style/portal/acp_portal_welcome.html

@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<script type="text/javascript" src="{ROOT_PATH}style/portal/acp_portal.js"></script>
+<!-- INCLUDEJS portal/acp_editor.js -->
 <script type="text/javascript">
 // <![CDATA[
 /**
@@ -53,6 +53,21 @@ var help_line = {
 	<!-- END custom_tags -->
 }
 
+function change_palette()
+{
+	phpbb.toggleDisplay('colour_palette');
+	e = document.getElementById('colour_palette');
+
+	if (e.style.display == 'block')
+	{
+		document.getElementById('bbpalette').value = '{LA_FONT_COLOR_HIDE}';
+	}
+	else
+	{
+		document.getElementById('bbpalette').value = '{LA_FONT_COLOR}';
+	}
+}
+
 // ]]>
 </script>
 
@@ -68,45 +83,45 @@ var help_line = {
 		<p>{ERROR_MSG}</p>
 	</div>
 <!-- ENDIF -->
-<form id="acp_portal_config" method="post" action="{U_ACTION}">
+<form id="acp_portal_config" method="post" action="{B3P_U_ACTION}">
 <!-- IF SHOW_MODULE_OPTIONS -->
 		<fieldset>
 			<legend>{L_MODULE_OPTIONS}</legend>
 			<dl>
-				<dt><label for="module_name">{L_MODULE_NAME}:</label><br /><span>{L_MODULE_NAME_EXP}</span></dt>
+				<dt><label for="module_name">{L_MODULE_NAME}{L_COLON}</label><br /><span>{L_MODULE_NAME_EXP}</span></dt>
 				<dd><input id="module_name" type="text" value="{MODULE_NAME}" name="module_name" maxlength="255" size="64" /></dd>
 			</dl>
 			<!-- IF MODULE_SHOW_IMAGE -->
 			<dl>
-				<dt><label for="module_image">{L_MODULE_IMAGE}:</label><br /><span>{L_MODULE_IMAGE_EXP}</span></dt>
+				<dt><label for="module_image">{L_MODULE_IMAGE}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_EXP}</span></dt>
 				<dd><input id="module_image" type="text" value="{MODULE_IMAGE}" name="module_image" maxlength="255" size="64" /></dd>
 				<!-- IF MODULE_IMAGE_SRC --><dd><img src="{MODULE_IMAGE_SRC}" alt="{L_MODULE_IMAGE}" /></dd><!-- ENDIF -->
 			</dl>
 			<!-- IF MODULE_IMAGE_SRC -->
 			<dl>
-				<dt><label for="module_img_width">{L_MODULE_IMAGE_WIDTH}:</label><br /><span>{L_MODULE_IMAGE_WIDTH_EXP}</span></dt>
+				<dt><label for="module_img_width">{L_MODULE_IMAGE_WIDTH}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_WIDTH_EXP}</span></dt>
 				<dd><input id="module_img_width" type="text" value="{MODULE_IMAGE_WIDTH}" name="module_img_width" maxlength="3" size="3" />px</dd>
 			</dl>
 			<dl>
-				<dt><label for="module_img_height">{L_MODULE_IMAGE_HEIGHT}:</label><br /><span>{L_MODULE_IMAGE_HEIGHT_EXP}</span></dt>
+				<dt><label for="module_img_height">{L_MODULE_IMAGE_HEIGHT}{L_COLON}</label><br /><span>{L_MODULE_IMAGE_HEIGHT_EXP}</span></dt>
 				<dd><input id="module_img_height" type="text" value="{MODULE_IMAGE_HEIGHT}" name="module_img_height" maxlength="3" size="3" />px</dd>
 			</dl>
 			<!-- ENDIF -->
 			<!-- ENDIF -->
 			<dl>
-				<dt><label for="module_reset">{L_MODULE_RESET}:</label><br /><span style="color: #BC2A4D;">{L_MODULE_RESET_EXP}</span></dt>
+				<dt><label for="module_reset">{L_MODULE_RESET}{L_COLON}</label><br /><span style="color: #BC2A4D;">{L_MODULE_RESET_EXP}</span></dt>
 				<dd><input id="module_reset" type="checkbox" value="1" name="module_reset" /></dd>
 			</dl>
 			<dl>
-				<dt><label for="module_status">{L_MODULE_STATUS}:</label></dt>
+				<dt><label for="module_status">{L_MODULE_STATUS}{L_COLON}</label></dt>
 				<dd>
 					<label><input type="radio" class="radio" name="module_status" value="1" id="module_status"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
 					<label><input type="radio" class="radio" name="module_status" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 				</dd>
 			</dl>
-			<!-- IF permission_setting -->
+			<!-- IF .permission_setting -->
 			<dl>
-				<dt><label for="permission-setting">{L_MODULE_PERMISSIONS}:</label><br /><span>{L_MODULE_PERMISSIONS_EXP}</span></dt>
+				<dt><label for="permission-setting">{L_MODULE_PERMISSIONS}{L_COLON}</label><br /><span>{L_MODULE_PERMISSIONS_EXP}</span></dt>
 				<dd>
 					<select id="permission-setting" size="10" multiple="multiple" name="permission-setting[]">
 						<!-- BEGIN permission_setting -->
@@ -130,42 +145,16 @@ var help_line = {
 		<!-- ENDIF -->
 		<fieldset>
 			<legend>{L_PORTAL_WELCOME}</legend>
-		<dl>
+		<dl><dt style="display: none;"></dt>
 			<dd>
 				<div id="colour_palette" style="display: none;">
 					<dl style="clear: left;">
-						<dt style="border: none;"><label>{L_FONT_COLOR}:</label><br /></dt>
+						<dt style="border: none;"><label>{L_FONT_COLOR}{L_COLON}</label></dt>
+						<dd></dd>
 					</dl>
 					<dl style="clear: left;">
-					<dt style="border: none;">
+						<dt id="color_palette_placeholder" style="border: none;"></dt>
-						<script type="text/javascript">
+						<dd></dd>
-						// <![CDATA[
-							function change_palette()
-							{
-								e = document.getElementById('colour_palette');
-								if(e.style.display == 'block')
-								{
-									dE('colour_palette', -1);
-								}
-								else
-								{
-									dE('colour_palette', 1);
-								}
-
-								if (e.style.display == 'block')
-								{
-									document.getElementById('bbpalette').value = '{LA_FONT_COLOR_HIDE}';
-								}
-								else
-								{
-									document.getElementById('bbpalette').value = '{LA_FONT_COLOR}';
-								}
-							}
-
-							colorPalette('h', 10, 5);
-						// ]]>
-						</script>
-					</dt>
 					</dl>
 				</div>
 				<div id="format-buttons">
@@ -208,7 +197,7 @@ var help_line = {
 		</dl>
 		<dl>
 			<dt>
-				<label for="welcome_message">{L_ACP_PORTAL_WELCOME_MESSAGE}:</label><br />
+				<label for="welcome_message">{L_ACP_PORTAL_WELCOME_MESSAGE}{L_COLON}</label><br />
 				<span>{L_ACP_PORTAL_WELCOME_MESSAGE_EXP}</span>
 			</dt>
 			<dd><textarea name="welcome_message" id="welcome_message" cols="6" rows="12">{WELCOME_MESSAGE}</textarea></dd>

adm/style/portal/ajax.js

@@ -0,0 +1,99 @@
+(function($) {  // Avoid conflicts with other libraries
+
+"use strict";
+
+/**
+ * The following callbacks are for reording items. row_down
+ * is triggered when an item is moved down, and row_up is triggered when
+ * an item is moved up. It moves the row up or down, and deactivates /
+ * activates any up / down icons that require it (the ones at the top or bottom).
+ */
+phpbb.addAjaxCallback('b3p_move_module_up', function(res) {
+	if (typeof res.success === 'undefined' || !res.success) {
+		return;
+	}
+
+	var el = $(this).parents('tr:first'),
+		trSwap = el.prev(),
+		elClass = trSwap.attr('class'),
+		trSwapClass = el.attr('class');
+
+	el.insertBefore(trSwap);
+	el.attr('class', elClass);
+	trSwap.attr('class', trSwapClass);
+
+	// Swap images if swap element is first row
+	var swapIsFirstRow = trSwap.find('img[src*="icon_up_disabled"]').parents('span:first').is(':visible');
+
+	if (swapIsFirstRow) {
+		trSwap.find('img[src*="icon_up_disabled"]').parents('span:first').toggle();
+		trSwap.find('img[src*="icon_up."]').parents('span:first').toggle();
+		el.find('img[src*="icon_up."]').parents('span:first').toggle();
+		el.find('img[src*="icon_up_disabled"]').parents('span:first').toggle();
+	}
+
+	// Swap images if move element is last row
+	var elIsLastRow = el.find('img[src*="icon_down_disabled"]').parents('span:first').is(':visible');
+
+	if (elIsLastRow) {
+		trSwap.find('img[src*="icon_down_disabled"]').parents('span:first').toggle();
+		trSwap.find('img[src*="icon_down."]').parents('span:first').toggle();
+		el.find('img[src*="icon_down."]').parents('span:first').toggle();
+		el.find('img[src*="icon_down_disabled"]').parents('span:first').toggle();
+	}
+});
+
+phpbb.addAjaxCallback('b3p_move_module_down', function(res) {
+	if (typeof res.success === 'undefined' || !res.success) {
+		return;
+	}
+
+	var el = $(this).parents('tr:first'),
+		trSwap = el.next(),
+		elClass = trSwap.attr('class'),
+		trSwapClass = el.attr('class');
+
+	el.insertAfter(trSwap);
+	el.attr('class', elClass);
+	trSwap.attr('class', trSwapClass);
+
+	// Swap images if swap element is last row
+	var swapIsLastRow = trSwap.find('img[src*="icon_down_disabled"]').parents('span:first').is(':visible');
+
+	if (swapIsLastRow) {
+		trSwap.find('img[src*="icon_down_disabled"]').parents('span:first').toggle();
+		trSwap.find('img[src*="icon_down."]').parents('span:first').toggle();
+		el.find('img[src*="icon_down."]').parents('span:first').toggle();
+		el.find('img[src*="icon_down_disabled"]').parents('span:first').toggle();
+	}
+
+	// Swap images if move element is first row
+	var elIsFirstRow = el.find('img[src*="icon_up_disabled"]').parents('span:first').is(':visible');
+
+	if (elIsFirstRow) {
+		trSwap.find('img[src*="icon_up_disabled"]').parents('span:first').toggle();
+		trSwap.find('img[src*="icon_up."]').parents('span:first').toggle();
+		el.find('img[src*="icon_up."]').parents('span:first').toggle();
+		el.find('img[src*="icon_up_disabled"]').parents('span:first').toggle();
+	}
+});
+
+phpbb.addAjaxCallback('b3p_delete_module', function(res) {
+	if (typeof res.success === 'undefined' || !res.success) {
+		return;
+	}
+
+	var el = $(this).parents('tr:first'),
+		nextEl = el.next();
+
+	el.remove();
+
+	// Fix classes of next elements
+	while (nextEl !== undefined && nextEl.is('tr')) {
+		var nextElClass = (nextEl.attr('class') === 'row1') ? 'row2' : 'row1';
+		nextEl.attr('class', nextElClass);
+		nextEl = nextEl.next();
+	}
+});
+
+})(jQuery); // Avoid conflicts with other libraries

adm/style/portal/b3p_admin.css

@@ -0,0 +1,10 @@
+/*  Board3 Portal 2.1 Admin Style Sheet
+	------------------------------------------------------------------------
+	Copyright 2014 board3 Group ( http://www.board3.de/ )
+	------------------------------------------------------------------------
+*/
+
+.portal-modules-overview {
+	border-collapse: separate;
+	border-spacing: 1px;
+}

composer.json

@@ -0,0 +1,40 @@
+{
+	"name": "board3/portal",
+	"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-rc1",
+	"time": "2014-11-26 14:23:15",
+	"license": "GPL-2.0",
+	"authors": [{
+			"name": "Marc Alexander",
+			"email": "admin@m-a-styles.de",
+			"homepage": "http://www.m-a-styles.de",
+			"role": "Lead Developer"
+		},  
+		{
+			"name": "Joas Schilling",
+			"email": "nickvergessen@gmx.de",
+			"homepage": "http://mods.flying-bits.org",
+			"role": "Developer"
+		}],
+	"require": {
+		"php": ">=5.3.3",
+		"nickvergessen/phpbb-tool-trimmessage": "1.3.*"
+	},
+	"require-dev": {
+		"satooshi/php-coveralls": "dev-master",
+		"phpbb/epv": "dev-master"
+	},
+	"extra": {
+		"display-name": "Board3 Portal",
+		"soft-require": {
+			"phpbb/phpbb": ">=3.1.2,<3.2.*@dev"
+		},
+		"version-check": {
+			"host": "board3.de",
+			"directory": "/updatecheck",
+			"filename": "board3_portal.json"
+		}
+	}
+}

composer.lock

@@ -0,0 +1,812 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "hash": "6322be845c2cb83f9f4e314d15157d45",
+    "packages": [
+        {
+            "name": "nickvergessen/phpbb-tool-trimmessage",
+            "version": "1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nickvergessen/phpbb-tool-trimmessage.git",
+                "reference": "2a3d8273dc1238dd06454688bcb6496f62f66c3b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nickvergessen/phpbb-tool-trimmessage/zipball/2a3d8273dc1238dd06454688bcb6496f62f66c3b",
+                "reference": "2a3d8273dc1238dd06454688bcb6496f62f66c3b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.1.*"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Joas Schilling",
+                    "email": "nickvergessen@gmx.de",
+                    "homepage": "https://github.com/nickvergessen",
+                    "role": "Developer"
+                }
+            ],
+            "description": "This tool contains a class, that is able to trim a message from the phpbb message_parser to a maximum length without breaking the bbcodes/smilies and links.",
+            "homepage": "https://github.com/nickvergessen/phpbb-tool-trimmessage",
+            "time": "2014-07-06 19:42:34"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "gitonomy/gitlib",
+            "version": "v0.1.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/gitonomy/gitlib.git",
+                "reference": "7a46107cfb8552b312101e0d5906e95d54d7ddc6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/gitonomy/gitlib/zipball/7a46107cfb8552b312101e0d5906e95d54d7ddc6",
+                "reference": "7a46107cfb8552b312101e0d5906e95d54d7ddc6",
+                "shasum": ""
+            },
+            "require": {
+                "symfony/process": "~2.4"
+            },
+            "require-dev": {
+                "psr/log": "~1"
+            },
+            "suggest": {
+                "psr/log": "Add some log"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Gitonomy\\Git": [
+                        "src/",
+                        "tests/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Alexandre Salomé",
+                    "email": "alexandre.salome@gmail.com",
+                    "homepage": "http://alexandre-salome.fr"
+                },
+                {
+                    "name": "Julien DIDIER",
+                    "email": "genzo.wm@gmail.com",
+                    "homepage": "http://www.jdidier.net"
+                }
+            ],
+            "description": "Library for accessing git",
+            "homepage": "http://gitonomy.com",
+            "time": "2014-07-13 19:02:31"
+        },
+        {
+            "name": "guzzle/guzzle",
+            "version": "v3.9.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/guzzle3.git",
+                "reference": "54991459675c1a2924122afbb0e5609ade581155"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/54991459675c1a2924122afbb0e5609ade581155",
+                "reference": "54991459675c1a2924122afbb0e5609ade581155",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "php": ">=5.3.3",
+                "symfony/event-dispatcher": "~2.1"
+            },
+            "replace": {
+                "guzzle/batch": "self.version",
+                "guzzle/cache": "self.version",
+                "guzzle/common": "self.version",
+                "guzzle/http": "self.version",
+                "guzzle/inflection": "self.version",
+                "guzzle/iterator": "self.version",
+                "guzzle/log": "self.version",
+                "guzzle/parser": "self.version",
+                "guzzle/plugin": "self.version",
+                "guzzle/plugin-async": "self.version",
+                "guzzle/plugin-backoff": "self.version",
+                "guzzle/plugin-cache": "self.version",
+                "guzzle/plugin-cookie": "self.version",
+                "guzzle/plugin-curlauth": "self.version",
+                "guzzle/plugin-error-response": "self.version",
+                "guzzle/plugin-history": "self.version",
+                "guzzle/plugin-log": "self.version",
+                "guzzle/plugin-md5": "self.version",
+                "guzzle/plugin-mock": "self.version",
+                "guzzle/plugin-oauth": "self.version",
+                "guzzle/service": "self.version",
+                "guzzle/stream": "self.version"
+            },
+            "require-dev": {
+                "doctrine/cache": "~1.3",
+                "monolog/monolog": "~1.0",
+                "phpunit/phpunit": "3.7.*",
+                "psr/log": "~1.0",
+                "symfony/class-loader": "~2.1",
+                "zendframework/zend-cache": "2.*,<2.3",
+                "zendframework/zend-log": "2.*,<2.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Guzzle": "src/",
+                    "Guzzle\\Tests": "tests/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Guzzle Community",
+                    "homepage": "https://github.com/guzzle/guzzle/contributors"
+                }
+            ],
+            "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
+            "homepage": "http://guzzlephp.org/",
+            "keywords": [
+                "client",
+                "curl",
+                "framework",
+                "http",
+                "http client",
+                "rest",
+                "web service"
+            ],
+            "time": "2014-08-11 04:32:36"
+        },
+        {
+            "name": "nikic/php-parser",
+            "version": "v0.9.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "ef70767475434bdb3615b43c327e2cae17ef12eb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ef70767475434bdb3615b43c327e2cae17ef12eb",
+                "reference": "ef70767475434bdb3615b43c327e2cae17ef12eb",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "PHPParser": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Nikita Popov"
+                }
+            ],
+            "description": "A PHP parser written in PHP",
+            "keywords": [
+                "parser",
+                "php"
+            ],
+            "time": "2014-07-23 18:24:17"
+        },
+        {
+            "name": "phpbb/epv",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpbb/epv.git",
+                "reference": "4122e7329b683ac253ad99a90d1415e2ec83eb3a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpbb/epv/zipball/4122e7329b683ac253ad99a90d1415e2ec83eb3a",
+                "reference": "4122e7329b683ac253ad99a90d1415e2ec83eb3a",
+                "shasum": ""
+            },
+            "require": {
+                "gitonomy/gitlib": "0.1.*@dev",
+                "nikic/php-parser": "0.9.*@dev",
+                "php": ">=5.3.3",
+                "symfony/console": ">=2.3.0",
+                "symfony/finder": ">=2.3.0",
+                "symfony/yaml": ">=2.3.0|>=2.4.0|>=2.5.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.0.*"
+            },
+            "bin": [
+                "src/EPV.php"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Phpbb\\Epv\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Paul Sohier",
+                    "email": "paul@phpbb.com"
+                }
+            ],
+            "description": "A extension validator for phpBB extensions. Extensions are required to pass the validator when submitted to the extension database.",
+            "time": "2014-08-16 16:29:34"
+        },
+        {
+            "name": "psr/log",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
+                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Psr\\Log\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "time": "2012-12-21 11:40:51"
+        },
+        {
+            "name": "satooshi/php-coveralls",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/satooshi/php-coveralls.git",
+                "reference": "94389a0ebdb64857d6899b5e0254dffa99e5aa96"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/94389a0ebdb64857d6899b5e0254dffa99e5aa96",
+                "reference": "94389a0ebdb64857d6899b5e0254dffa99e5aa96",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-simplexml": "*",
+                "guzzle/guzzle": ">=2.7",
+                "php": ">=5.3",
+                "psr/log": "1.0.0",
+                "symfony/config": ">=2.0",
+                "symfony/console": ">=2.0",
+                "symfony/stopwatch": ">=2.2",
+                "symfony/yaml": ">=2.0"
+            },
+            "require-dev": {
+                "apigen/apigen": "2.8.*@stable",
+                "pdepend/pdepend": "dev-master as 2.0.0",
+                "phpmd/phpmd": "dev-master",
+                "phpunit/php-invoker": ">=1.1.0,<1.2.0",
+                "phpunit/phpunit": "3.7.*@stable",
+                "sebastian/finder-facade": "dev-master",
+                "sebastian/phpcpd": "1.4.*@stable",
+                "squizlabs/php_codesniffer": "1.4.*@stable",
+                "theseer/fdomdocument": "dev-master"
+            },
+            "suggest": {
+                "symfony/http-kernel": "Allows Symfony integration"
+            },
+            "bin": [
+                "composer/bin/coveralls"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Satooshi\\Component": "src/",
+                    "Satooshi\\Bundle": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kitamura Satoshi",
+                    "email": "with.no.parachute@gmail.com",
+                    "homepage": "https://www.facebook.com/satooshi.jp"
+                }
+            ],
+            "description": "PHP client library for Coveralls API",
+            "homepage": "https://github.com/satooshi/php-coveralls",
+            "keywords": [
+                "ci",
+                "coverage",
+                "github",
+                "test"
+            ],
+            "time": "2014-07-09 10:45:38"
+        },
+        {
+            "name": "symfony/config",
+            "version": "v2.5.3",
+            "target-dir": "Symfony/Component/Config",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Config.git",
+                "reference": "8d044668c7ccb4ade684e368d910e3aadcff6f6c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Config/zipball/8d044668c7ccb4ade684e368d910e3aadcff6f6c",
+                "reference": "8d044668c7ccb4ade684e368d910e3aadcff6f6c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "symfony/filesystem": "~2.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Config\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony Config Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-08-05 09:00:40"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v2.5.3",
+            "target-dir": "Symfony/Component/Console",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Console.git",
+                "reference": "cd2d1e4bac2206b337326b0140ff475fe9ad5f63"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Console/zipball/cd2d1e4bac2206b337326b0140ff475fe9ad5f63",
+                "reference": "cd2d1e4bac2206b337326b0140ff475fe9ad5f63",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/event-dispatcher": "~2.1"
+            },
+            "suggest": {
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Console\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony Console Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-08-05 09:00:40"
+        },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "v2.5.3",
+            "target-dir": "Symfony/Component/EventDispatcher",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/EventDispatcher.git",
+                "reference": "8faf5cc7e80fde74a650a36e60d32ce3c3e0457b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/8faf5cc7e80fde74a650a36e60d32ce3c3e0457b",
+                "reference": "8faf5cc7e80fde74a650a36e60d32ce3c3e0457b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "~2.0",
+                "symfony/dependency-injection": "~2.0",
+                "symfony/stopwatch": "~2.2"
+            },
+            "suggest": {
+                "symfony/dependency-injection": "",
+                "symfony/http-kernel": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\EventDispatcher\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony EventDispatcher Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-07-28 13:20:46"
+        },
+        {
+            "name": "symfony/filesystem",
+            "version": "v2.5.3",
+            "target-dir": "Symfony/Component/Filesystem",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Filesystem.git",
+                "reference": "c1309b0ee195ad264a4314435bdaecdfacb8ae9c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/c1309b0ee195ad264a4314435bdaecdfacb8ae9c",
+                "reference": "c1309b0ee195ad264a4314435bdaecdfacb8ae9c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Filesystem\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony Filesystem Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-07-09 09:05:48"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "v2.5.3",
+            "target-dir": "Symfony/Component/Finder",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Finder.git",
+                "reference": "090fe4eaff414d8f2171c7a4748ea868d530775f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Finder/zipball/090fe4eaff414d8f2171c7a4748ea868d530775f",
+                "reference": "090fe4eaff414d8f2171c7a4748ea868d530775f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Finder\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony Finder Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-07-28 13:20:46"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v2.5.3",
+            "target-dir": "Symfony/Component/Process",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Process.git",
+                "reference": "e0997d2a9a1a763484b34b989900b61322a9b056"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Process/zipball/e0997d2a9a1a763484b34b989900b61322a9b056",
+                "reference": "e0997d2a9a1a763484b34b989900b61322a9b056",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Process\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony Process Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-08-05 09:00:40"
+        },
+        {
+            "name": "symfony/stopwatch",
+            "version": "v2.5.3",
+            "target-dir": "Symfony/Component/Stopwatch",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Stopwatch.git",
+                "reference": "086c8c98c3016f59f5e6e7b15b751c2384b311e5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/086c8c98c3016f59f5e6e7b15b751c2384b311e5",
+                "reference": "086c8c98c3016f59f5e6e7b15b751c2384b311e5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Stopwatch\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony Stopwatch Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-08-06 06:44:37"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v2.5.3",
+            "target-dir": "Symfony/Component/Yaml",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Yaml.git",
+                "reference": "5a75366ae9ca8b4792cd0083e4ca4dff9fe96f1f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/5a75366ae9ca8b4792cd0083e4ca4dff9fe96f1f",
+                "reference": "5a75366ae9ca8b4792cd0083e4ca4dff9fe96f1f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Yaml\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-08-05 09:00:40"
+        }
+    ],
+    "aliases": [
+
+    ],
+    "minimum-stability": "stable",
+    "stability-flags": {
+        "satooshi/php-coveralls": 20,
+        "phpbb/epv": 20
+    },
+    "platform": {
+        "php": ">=5.3.3"
+    },
+    "platform-dev": [
+
+    ]
+}

config/modules.yml

@@ -0,0 +1,319 @@
+services:
+    board3.portal.module.announcements:
+        class: board3\portal\modules\announcements
+        arguments:
+            - @auth
+            - @cache
+            - @config
+            - @template
+            - @dbal.conn
+            - @pagination
+            - @board3.portal.modules_helper
+            - @request
+            - %core.php_ext%
+            - %core.root_path%
+            - @user
+            - @board3.portal.fetch_posts
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.attachments:
+        class: board3\portal\modules\attachments
+        arguments:
+            - @auth
+            - @config
+            - @board3.portal.modules_helper
+            - @template
+            - @dbal.conn
+            - @request
+            - %core.php_ext%
+            - %core.root_path%
+            - @user
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.birthday_list:
+        class: board3\portal\modules\birthday_list
+        arguments:
+            - @config
+            - @template
+            - @dbal.conn
+            - @user
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.calendar:
+        class: board3\portal\modules\calendar
+        arguments:
+            - @config
+            - @template
+            - @dbal.conn
+            - @request
+            - %core.root_path%
+            - %core.php_ext%
+            - @user
+            - @path_helper
+            - @log
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.clock:
+        class: board3\portal\modules\clock
+        arguments:
+            - @config
+            - @template
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.custom:
+        class: board3\portal\modules\custom
+        arguments:
+            - @config
+            - @template
+            - @dbal.conn
+            - @request
+            - %core.root_path%
+            - %core.php_ext%
+            - @user
+            - @log
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.donation:
+        class: board3\portal\modules\donation
+        arguments:
+            - @config
+            - @template
+            - @user
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.forumlist:
+        class: board3\portal\modules\forumlist
+        arguments:
+            - @auth
+            - @config
+            - @template
+            - %core.root_path%
+            - %core.php_ext%
+            - @user
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.friends:
+        class: board3\portal\modules\friends
+        arguments:
+            - @auth
+            - @config
+            - @dbal.conn
+            - @template
+            - @user
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.latest_bots:
+        class: board3\portal\modules\latest_bots
+        arguments:
+            - @config
+            - @dbal.conn
+            - @template
+            - @user
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.latest_members:
+        class: board3\portal\modules\latest_members
+        arguments:
+            - @config
+            - @dbal.conn
+            - @template
+            - @user
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.leaders:
+        class: board3\portal\modules\leaders
+        arguments:
+            - @auth
+            - @config
+            - @dbal.conn
+            - @template
+            - %core.root_path%
+            - %core.php_ext%
+            - @user
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.link_us:
+        class: board3\portal\modules\link_us
+        arguments:
+            - @config
+            - @template
+            - @user
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.links:
+        class: board3\portal\modules\links
+        arguments:
+            - @config
+            - @dbal.conn
+            - @request
+            - @template
+            - %core.root_path%
+            - %core.php_ext%
+            - @user
+            - @log
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.main_menu:
+        class: board3\portal\modules\main_menu
+        arguments:
+            - @config
+            - @dbal.conn
+            - @request
+            - @template
+            - %core.root_path%
+            - %core.php_ext%
+            - @user
+            - @log
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.news:
+        class: board3\portal\modules\news
+        arguments:
+            - @auth
+            - @cache
+            - @config
+            - @dbal.conn
+            - @pagination
+            - @board3.portal.modules_helper
+            - @request
+            - @template
+            - %core.root_path%
+            - %core.php_ext%
+            - @user
+            - @board3.portal.fetch_posts
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.poll:
+        class: board3\portal\modules\poll
+        arguments:
+            - @auth
+            - @config
+            - @dbal.conn
+            - @request
+            - @template
+            - %core.root_path%
+            - %core.php_ext%
+            - @user
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.random_member:
+        class: board3\portal\modules\random_member
+        arguments:
+            - @dbal.conn
+            - @template
+            - @user
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.recent:
+        class: board3\portal\modules\recent
+        arguments:
+            - @auth
+            - @config
+            - @dbal.conn
+            - @request
+            - @template
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.search:
+        class: board3\portal\modules\search
+        arguments:
+            - @template
+            - %core.php_ext%
+            - %core.root_path%
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.statistics:
+        class: board3\portal\modules\statistics
+        arguments:
+            - @cache
+            - @config
+            - @dbal.conn
+            - @template
+            - @user
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.stylechanger:
+        class: board3\portal\modules\stylechanger
+        arguments:
+            - @config
+            - @template
+            - @dbal.conn
+            - @request
+            - %core.php_ext%
+            - %core.root_path%
+            - @user
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.topposters:
+        class: board3\portal\modules\topposters
+        arguments:
+            - @config
+            - @dbal.conn
+            - @template
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.user_menu:
+        class: board3\portal\modules\user_menu
+        arguments:
+            - @auth
+            - @config
+            - @controller.helper
+            - @dbal.conn
+            - @path_helper
+            - @template
+            - @user
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.welcome:
+        class: board3\portal\modules\welcome
+        arguments:
+            - @config
+            - @request
+            - @template
+            - @user
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: board3.portal.module }
+
+    board3.portal.module.whois_online:
+        class: board3\portal\modules\whois_online
+        arguments:
+            - @auth
+            - @dbal.conn
+            - @template
+            - @user
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: board3.portal.module }

config/routing.yml

@@ -0,0 +1,13 @@
+board3_portal_controller:
+    pattern: /portal
+    defaults: { _controller: board3.portal.main:handle }
+
+# This is currently not supported yet
+# board3_portal_pages_controller:
+#     pattern: /portal/{page}
+#     defaults: { _controller: board3.portal.main:handle_page, page: "portal" }
+
+# Redirect to portal by default
+board3_portal_redirect_controller:
+    pattern: /
+    defaults: { _controller: board3.portal.main:handle }

config/services.yml

@@ -0,0 +1,92 @@
+imports:
+    - { resource: modules.yml }
+
+parameters:
+    board3.version_data:
+        author: Marc
+        title: Board3 Portal
+        version: board3_portal_version
+        file:
+            - board3.de
+            - /updatecheck
+            - board3_portal.json
+    board3.portal.config.table: %core.table_prefix%portal_config
+    board3.portal.modules.table: %core.table_prefix%portal_modules
+
+services:
+    board3.portal.main:
+        class: board3\portal\controller\main
+        arguments:
+            - @config
+            - @board3.portal.controller_helper
+            - @template
+            - @user
+            - @path_helper
+            - %core.root_path%
+            - .%core.php_ext%
+            - %board3.portal.config.table%
+            - %board3.portal.modules.table%
+
+    board3.portal.controller_helper:
+        class: board3\portal\controller\helper
+        arguments:
+            - @auth
+            - @config
+            - @template
+            - @user
+            - @path_helper
+            - @board3.portal.helper
+            - %core.root_path%
+            - .%core.php_ext%
+
+    board3.portal.version.check:
+        class: board3\portal\includes\version_check
+        scope: prototype
+        arguments:
+            - %board3.version_data%
+            - @config
+            - @version_helper
+            - @template
+            - @user
+
+    board3.portal.module_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: board3.portal.module }
+
+    board3.portal.helper:
+        class: board3\portal\includes\helper
+        arguments:
+            - @board3.portal.module_collection
+
+    board3.portal.modules_helper:
+        class: board3\portal\includes\modules_helper
+        arguments:
+            - @auth
+            - @config
+            - @request
+
+    board3.portal.fetch_posts:
+        class: board3\portal\portal\fetch_posts
+        arguments:
+            - @auth
+            - @cache
+            - @config
+            - @dbal.conn
+            - @board3.portal.modules_helper
+            - @user
+
+    board3.portal.listener:
+        class: board3\portal\event\listener
+        arguments:
+            - @auth
+            - @config
+            - @controller.helper
+            - @path_helper
+            - @template
+            - @user
+            - %core.php_ext%
+        tags:
+            - { name: event.listener }

contrib/de.xml

@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<?xml-stylesheet type="text/xsl" href="modx.prosilver.en.xsl"?>
-<!--For security purposes, please check: http://www.phpbb.com/mods/ for the latest version of this MOD. Although MODs are checked before being allowed in the MODs Database there is no guarantee that there are no security problems within the MOD. No support will be given for MODs not found within the MODs Database which can be found at http://www.phpbb.com/mods/-->
-<mod xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://www.phpbb.com/mods/xml/modx-1.2.6.xsd">
-	<header>
-		<license>http://opensource.org/licenses/gpl-license.php GNU General Public License v2</license>
-
-		<title lang="en">board3 Portal - German Language</title>
-		<title lang="de">board3 Portal - Deutsche Sprache</title>
-
-		<description lang="en">Adds a portal to your forum.
-It has several boxes wich can be turned on an off in the ACP and certain settings.
-
-Included language files:
-» English (en)
-» German (de)
-
-More languages can be found in our International forum: http://www.board3.de/viewforum.php?f=13</description>
-		<description lang="de">Fügt ein Portal deinem Forum hinzu.
-Es hat diverse Boxen, die über das ACP an- / abgeschaltet und eingestellt werden können.
-
-Enthaltenen Sprachdateien:
-» Englisch (en)
-» Deutsch (de)
-
-Weitere Sprachen kannst in unseren International Forum finden: http://www.board3.de/viewforum.php?f=13
-</description>
-
-		<author-notes lang="en">I hope you get everything working. Further developement, new boxes for the portal or questions are welcome at www.board3.de
-		</author-notes>
-		<author-notes lang="de">Ich hoffe ihr habt Spaß am Portal. Neuen Code, bzw neue Boxen und Fragen könnt ihr auf www.board3.de posten.
-		</author-notes>
-		<github>https://github.com/board3/Board3-Portal</github>
-		<author-group>
-			<author>
-				<realname>Marc Alexander</realname>
-				<username>Marc</username>
-				<email>admin@m-a-styles.de</email>
-				<homepage>http://www.m-a-styles.de</homepage>
-				<contributions-group>
-					<contributions status="current" position="Main-Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Joas Schilling</realname>
-				<email>nickvergessen@gmx.de</email>
-				<username>nickvergessen</username>
-				<homepage>http://mods.flying-bits.org/</homepage>
-				<contributions-group>
-					<contributions status="current" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Kevin</realname>
-				<username>saint_hh</username>
-				<homepage>http://www.board3.de</homepage>
-				<contributions-group>
-					<contributions status="current" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Ice</realname>
-				<username>avaren</username>
-				<homepage>http://www.board3.de</homepage>
-				<contributions-group>
-					<contributions status="past" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Christian</realname>
-				<username>Christian_N</username>
-				<homepage>http://www.phpbb-projekt.de</homepage>
-				<contributions-group>
-					<contributions status="past" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Walter</realname>
-				<email>w.bobeth@digitalfotografie-foren.de</email>
-				<username>Redbull254</username>
-				<homepage>http://www.digitalfotografie-foren.de</homepage>
-				<contributions-group>
-					<contributions status="past" position="Developer"></contributions>
-				</contributions-group>
-			 </author>
-		</author-group>
-
-		<mod-version>2.0.2</mod-version>
-
-		<installation>
-			<level>easy</level>
-			<time>120</time>
-			<target-version>3.0.12</target-version>
-		</installation>
-
-		<link-group>
-			<link type="parent" lang="de" href="../install.xml">Installations-Anleitung</link>
-			<link type="parent" lang="en" href="../install.xml">Manual</link>
-		</link-group>
-	</header>
-	<action-group>
-		<copy>
-			<file from="root/language/de/mods/*.*" to="language/de/mods/*.*" />
-		</copy>
-
-		<diy-instructions lang="en">See general install.xml file</diy-instructions>
-		<diy-instructions lang="de">Siehe install.xml</diy-instructions>
-	</action-group>
-</mod>

contrib/subsilver2.xml

@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<?xml-stylesheet type="text/xsl" href="modx.prosilver.en.xsl"?>
-<!--For security purposes, please check: http://www.phpbb.com/mods/ for the latest version of this MOD. Although MODs are checked before being allowed in the MODs Database there is no guarantee that there are no security problems within the MOD. No support will be given for MODs not found within the MODs Database which can be found at http://www.phpbb.com/mods/-->
-<mod xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://www.phpbb.com/mods/xml/modx-1.2.6.xsd">
-	<header>
-		<license>http://opensource.org/licenses/gpl-license.php GNU General Public License v2</license>
-
-		<title lang="en">board3 Portal - subsilver2 style</title>
-		<title lang="de">board3 Portal - subsilver2 style</title>
-
-		<description lang="en">Adds a portal to your forum.
-It has several boxes wich can be turned on an off in the ACP and certain settings.
-
-Included language files:
-» English (en)
-» German (de)
-
-More languages can be found in our International forum: http://www.board3.de/viewforum.php?f=13</description>
-		<description lang="de">Fügt ein Portal deinem Forum hinzu.
-Es hat diverse Boxen, die über das ACP an- / abgeschaltet und eingestellt werden können.
-
-Enthaltenen Sprachdateien:
-» Englisch (en)
-» Deutsch (de)
-
-Weitere Sprachen kannst in unseren International Forum finden: http://www.board3.de/viewforum.php?f=13
-</description>
-
-		<author-notes lang="en">I hope you get everything working. Further developement, new boxes for the portal or questions are welcome at www.board3.de
-		</author-notes>
-		<author-notes lang="de">Ich hoffe ihr habt Spaß am Portal. Neuen Code, bzw neue Boxen und Fragen könnt ihr auf www.board3.de posten.
-		</author-notes>
-		<github>https://github.com/board3/Board3-Portal</github>
-		<author-group>
-			<author>
-				<realname>Marc Alexander</realname>
-				<username>Marc</username>
-				<email>admin@m-a-styles.de</email>
-				<homepage>http://www.m-a-styles.de</homepage>
-				<contributions-group>
-					<contributions status="current" position="Main-Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Joas Schilling</realname>
-				<email>nickvergessen@gmx.de</email>
-				<username>nickvergessen</username>
-				<homepage>http://mods.flying-bits.org/</homepage>
-				<contributions-group>
-					<contributions status="current" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Kevin</realname>
-				<username>saint_hh</username>
-				<homepage>http://www.board3.de</homepage>
-				<contributions-group>
-					<contributions status="current" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Ice</realname>
-				<username>avaren</username>
-				<homepage>http://www.board3.de</homepage>
-				<contributions-group>
-					<contributions status="past" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Christian</realname>
-				<username>Christian_N</username>
-				<homepage>http://www.phpbb-projekt.de</homepage>
-				<contributions-group>
-					<contributions status="past" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Walter</realname>
-				<email>w.bobeth@digitalfotografie-foren.de</email>
-				<username>Redbull254</username>
-				<homepage>http://www.digitalfotografie-foren.de</homepage>
-				<contributions-group>
-					<contributions status="past" position="Developer"></contributions>
-				</contributions-group>
-			 </author>
-		</author-group>
-
-		<mod-version>2.0.2</mod-version>
-
-		<installation>
-			<level>easy</level>
-			<time>120</time>
-			<target-version>3.0.12</target-version>
-		</installation>
-
-		<link-group>
-			<link type="parent" lang="de" href="../install.xml">Installations-Anleitung</link>
-			<link type="parent" lang="en" href="../install.xml">Manual</link>
-		</link-group>	
-	</header>
-	<action-group>
-		<copy>
-			<file from="root/styles/subsilver2/template/portal/*.*" to="styles/subsilver2/template/portal/*.*" />
-			<file from="root/styles/subsilver2/theme/images/portal/*.*" to="styles/subsilver2/theme/images/portal/*.*" />
-		</copy>
-		<open src="styles/subsilver2/template/breadcrumbs.html">
-			<edit>
-				<find><![CDATA[<p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> &#187; ]]></find>
-				<inline-edit>
-					<inline-find><![CDATA[<a href="{U_INDEX}">{L_INDEX}</a>]]></inline-find>
-					<inline-action type="before-add"><![CDATA[<!-- IF U_PORTAL --><a href="{U_PORTAL}">{L_PORTAL}</a> &#187; <!-- ENDIF -->]]></inline-action>
-				</inline-edit>
-			</edit>
-		</open>
-		<open src="styles/subsilver2/template/overall_header.html">
-			<edit>
-				<find><![CDATA[	<div id="logodesc">
-		<table width="100%" cellspacing="0">
-		<tr>
-			<td><a href="{U_INDEX}">{SITE_LOGO_IMG}</a></td>
-			<td width="100%" align="center"><h1>{SITENAME}</h1><span class="gen">{SITE_DESCRIPTION}</span></td>
-		</tr>
-		</table>
-	</div>]]></find>
-				<action type="after-add"><![CDATA[<!-- IF not $S_IN_PORTAL or S_DISPLAY_PHPBB_MENU -->]]></action>
-			</edit>
-			<edit>
-				<find><![CDATA[				<!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN --> &nbsp;<span style="color: red;">{L_BOARD_DISABLED}</span><!-- ENDIF -->]]></find>
-				<action type="before-add"><![CDATA[<!-- ENDIF -->]]></action>
-				<action type="after-add"><![CDATA[<!-- IF not $S_IN_PORTAL or S_DISPLAY_PHPBB_MENU -->]]></action>
-			</edit>
-			<edit>
-				<find><![CDATA[	<div id="datebar">
-		<table width="100%" cellspacing="0">
-		<tr>
-			<td class="gensmall"><!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<!-- ENDIF --></td>
-			<td class="gensmall" align="{S_CONTENT_FLOW_END}">{CURRENT_TIME}<br /></td>
-		</tr>
-		</table>
-	</div>]]></find>
-				<action type="after-add"><![CDATA[<!-- ENDIF -->]]></action>
-			</edit>
-			<edit>
-				<find><![CDATA[<div id="wrapcentre">]]></find>
-				<action type="after-add"><![CDATA[<!-- IF not $S_IN_PORTAL or S_DISPLAY_PHPBB_MENU -->]]></action>
-			</edit>
-			<edit>
-				<find><![CDATA[	<!-- INCLUDE breadcrumbs.html -->
-
-	<br />]]></find>
-				<action type="after-add"><![CDATA[<!-- ENDIF -->]]></action>
-			</edit>
-		</open>
-		
-		<diy-instructions lang="de"><![CDATA[
-Aktualisiere deine Styles:
-    "Administrations-Bereich" (ACP) > "Styles" > "Templates" > jedes > "Aktualisieren"
-    "Administrations-Bereich" (ACP) > "Styles" > "Themes" > jedes > "Aktualisieren"
-    "Administrations-Bereich" (ACP) > "Styles" > "Grafiksammlungen" > jedes > "Aktualisieren"
-
-Leere den Cache im "Administrations-Bereich" (ACP) > "Allgemein" > "Den Cache leeren"
-]]></diy-instructions>
-		<diy-instructions lang="en"><![CDATA[
-Refresh your Styles:
-    "Administration Control Panel" (ACP) > "Styles" > "Templates" > each > "refresh"
-    "Administration Control Panel" (ACP) > "Styles" > "Themes" > each > "refresh"
-    "Administration Control Panel" (ACP) > "Styles" > "Imagesets" > each > "refresh"
-
-Clear your cache in the "Administration Control Panel" (ACP) > "General" > "Purge the cache"
-]]></diy-instructions>
-	</action-group>
-</mod>

contrib/update_201_to_202/contrib/de.xml

@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<?xml-stylesheet type="text/xsl" href="modx.prosilver.en.xsl"?>
-<!--For security purposes, please check: http://www.phpbb.com/mods/ for the latest version of this MOD. Although MODs are checked before being allowed in the MODs Database there is no guarantee that there are no security problems within the MOD. No support will be given for MODs not found within the MODs Database which can be found at http://www.phpbb.com/mods/-->
-<mod xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://www.phpbb.com/mods/xml/modx-1.2.6.xsd">
-	<header>
-		<license>http://opensource.org/licenses/gpl-license.php GNU General Public License v2</license>
-
-		<title lang="en">board3 Portal - German Language Update for 2.0.2</title>
-		<title lang="de">board3 Portal - Deutsche Sprache Aktualisiering für 2.0.2</title>
-
-		<description lang="en">Adds a portal to your forum.
-It has several boxes wich can be turned on an off in the ACP and certain settings.
-
-Included language files:
-» English (en)
-» German (de)
-
-More languages can be found in our International forum: http://www.board3.de/viewforum.php?f=13</description>
-		<description lang="de">Fügt ein Portal deinem Forum hinzu.
-Es hat diverse Boxen, die über das ACP an- / abgeschaltet und eingestellt werden können.
-
-Enthaltenen Sprachdateien:
-» Englisch (en)
-» Deutsch (de)
-
-Weitere Sprachen kannst in unseren International Forum finden: http://www.board3.de/viewforum.php?f=13
-</description>
-
-		<author-notes lang="en">I hope you get everything working. Further developement, new boxes for the portal or questions are welcome at www.board3.de
-		</author-notes>
-		<author-notes lang="de">Ich hoffe ihr habt Spaß am Portal. Neuen Code, bzw neue Boxen und Fragen könnt ihr auf www.board3.de posten.
-		</author-notes>
-		<github>https://github.com/board3/Board3-Portal</github>
-		<author-group>
-			<author>
-				<realname>Marc Alexander</realname>
-				<username>Marc</username>
-				<email>admin@m-a-styles.de</email>
-				<homepage>http://www.m-a-styles.de</homepage>
-				<contributions-group>
-					<contributions status="current" position="Main-Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Joas Schilling</realname>
-				<email>nickvergessen@gmx.de</email>
-				<username>nickvergessen</username>
-				<homepage>http://mods.flying-bits.org/</homepage>
-				<contributions-group>
-					<contributions status="current" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Kevin</realname>
-				<username>saint_hh</username>
-				<homepage>http://www.board3.de</homepage>
-				<contributions-group>
-					<contributions status="current" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Ice</realname>
-				<username>avaren</username>
-				<homepage>http://www.board3.de</homepage>
-				<contributions-group>
-					<contributions status="past" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Christian</realname>
-				<username>Christian_N</username>
-				<homepage>http://www.phpbb-projekt.de</homepage>
-				<contributions-group>
-					<contributions status="past" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Walter</realname>
-				<email>w.bobeth@digitalfotografie-foren.de</email>
-				<username>Redbull254</username>
-				<homepage>http://www.digitalfotografie-foren.de</homepage>
-				<contributions-group>
-					<contributions status="past" position="Developer"></contributions>
-				</contributions-group>
-			 </author>
-		</author-group>
-
-		<mod-version>2.0.2</mod-version>
-
-		<installation>
-			<level>easy</level>
-			<time>120</time>
-			<target-version>3.0.12</target-version>
-		</installation>
-
-		<link-group>
-			<link type="parent" lang="de" href="../update.xml">Update-Anleitung</link>
-			<link type="parent" lang="en" href="../update.xml">Update instructions</link>
-		</link-group>
-	</header>
-	<action-group>
-		<copy>
-			<file from="root/language/de/mods/*.*" to="language/de/mods/*.*" />
-		</copy>
-		<diy-instructions lang="en">See general install.xml file</diy-instructions>
-		<diy-instructions lang="de">Siehe install.xml</diy-instructions>
-	</action-group>
-</mod>

contrib/update_201_to_202/contrib/subsilver2.xml

@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<?xml-stylesheet type="text/xsl" href="modx.prosilver.en.xsl"?>
-<!--For security purposes, please check: http://www.phpbb.com/mods/ for the latest version of this MOD. Although MODs are checked before being allowed in the MODs Database there is no guarantee that there are no security problems within the MOD. No support will be given for MODs not found within the MODs Database which can be found at http://www.phpbb.com/mods/-->
-<mod xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://www.phpbb.com/mods/xml/modx-1.2.6.xsd">
-	<header>
-		<license>http://opensource.org/licenses/gpl-license.php GNU General Public License v2</license>
-
-		<title lang="en">board3 Portal - Update subsilver2 style for 2.0.2</title>
-		<title lang="de">board3 Portal - Aktualisiere das subsilver2 style für 2.0.2</title>
-
-		<description lang="en">Adds a portal to your forum.
-It has several boxes wich can be turned on an off in the ACP and certain settings.
-
-Included language files:
-» English (en)
-» German (de)
-
-More languages can be found in our International forum: http://www.board3.de/viewforum.php?f=13</description>
-		<description lang="de">Fügt ein Portal deinem Forum hinzu.
-Es hat diverse Boxen, die über das ACP an- / abgeschaltet und eingestellt werden können.
-
-Enthaltenen Sprachdateien:
-» Englisch (en)
-» Deutsch (de)
-
-Weitere Sprachen kannst in unseren International Forum finden: http://www.board3.de/viewforum.php?f=13
-</description>
-
-		<author-notes lang="en">I hope you get everything working. Further developement, new boxes for the portal or questions are welcome at www.board3.de
-		</author-notes>
-		<author-notes lang="de">Ich hoffe ihr habt Spaß am Portal. Neuen Code, bzw neue Boxen und Fragen könnt ihr auf www.board3.de posten.
-		</author-notes>
-		<github>https://github.com/board3/Board3-Portal</github>
-		<author-group>
-			<author>
-				<realname>Marc Alexander</realname>
-				<username>Marc</username>
-				<email>admin@m-a-styles.de</email>
-				<homepage>http://www.m-a-styles.de</homepage>
-				<contributions-group>
-					<contributions status="current" position="Main-Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Joas Schilling</realname>
-				<email>nickvergessen@gmx.de</email>
-				<username>nickvergessen</username>
-				<homepage>http://mods.flying-bits.org/</homepage>
-				<contributions-group>
-					<contributions status="current" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Kevin</realname>
-				<username>saint_hh</username>
-				<homepage>http://www.board3.de</homepage>
-				<contributions-group>
-					<contributions status="current" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Ice</realname>
-				<username>avaren</username>
-				<homepage>http://www.board3.de</homepage>
-				<contributions-group>
-					<contributions status="past" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Christian</realname>
-				<username>Christian_N</username>
-				<homepage>http://www.phpbb-projekt.de</homepage>
-				<contributions-group>
-					<contributions status="past" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Walter</realname>
-				<email>w.bobeth@digitalfotografie-foren.de</email>
-				<username>Redbull254</username>
-				<homepage>http://www.digitalfotografie-foren.de</homepage>
-				<contributions-group>
-					<contributions status="past" position="Developer"></contributions>
-				</contributions-group>
-			 </author>
-		</author-group>
-
-		<mod-version>2.0.2</mod-version>
-
-		<installation>
-			<level>easy</level>
-			<time>120</time>
-			<target-version>3.0.12</target-version>
-		</installation>
-
-		<link-group>
-			<link type="parent" lang="de" href="../update.xml">Update-Anleitung</link>
-			<link type="parent" lang="en" href="../update.xml">Update instructions</link>
-		</link-group>	
-	</header>
-	<action-group>
-		<copy>
-			<file from="root/styles/subsilver2/template/portal/modules/*.*" to="styles/subsilver2/template/portal/modules/*.*" />
-		</copy>
-		<diy-instructions lang="de"><![CDATA[
-Aktualisiere deine Styles:
-    "Administrations-Bereich" (ACP) > "Styles" > "Templates" > jedes > "Aktualisieren"
-    "Administrations-Bereich" (ACP) > "Styles" > "Themes" > jedes > "Aktualisieren"
-    "Administrations-Bereich" (ACP) > "Styles" > "Grafiksammlungen" > jedes > "Aktualisieren"
-
-Leere den Cache im "Administrations-Bereich" (ACP) > "Allgemein" > "Den Cache leeren"
-]]></diy-instructions>
-		<diy-instructions lang="en"><![CDATA[
-Refresh your Styles:
-    "Administration Control Panel" (ACP) > "Styles" > "Templates" > each > "refresh"
-    "Administration Control Panel" (ACP) > "Styles" > "Themes" > each > "refresh"
-    "Administration Control Panel" (ACP) > "Styles" > "Imagesets" > each > "refresh"
-
-Clear your cache in the "Administration Control Panel" (ACP) > "General" > "Purge the cache"
-]]></diy-instructions>
-	</action-group>
-</mod>

contrib/update_201_to_202/update.xml

@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<?xml-stylesheet type="text/xsl" href="modx.prosilver.en.xsl"?>
-<!--For security purposes, please check: http://www.phpbb.com/mods/ for the latest version of this MOD. Although MODs are checked before being allowed in the MODs Database there is no guarantee that there are no security problems within the MOD. No support will be given for MODs not found within the MODs Database which can be found at http://www.phpbb.com/mods/-->
-<mod xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://www.phpbb.com/mods/xml/modx-1.2.6.xsd">
-	<header>
-		<license>http://opensource.org/licenses/gpl-license.php GNU General Public License v2</license>
-
-		<title lang="en">board3 Portal 2.0.2 - Update from Board3 Portal 2.0.1</title>
-		<title lang="de">board3 Portal 2.0.2 - Update von Board3 Portal 2.0.1</title>
-
-		<description lang="en">Adds a portal to your forum.
-It has several boxes wich can be turned on an off in the ACP and certain settings.
-
-Included language files:
-» English (en)
-» German (de)
-
-More languages can be found in our International forum: http://www.board3.de/viewforum.php?f=13</description>
-		<description lang="de">Fügt ein Portal deinem Forum hinzu.
-Es hat diverse Boxen, die über das ACP an- / abgeschaltet und eingestellt werden können.
-
-Enthaltenen Sprachdateien:
-» Englisch (en)
-» Deutsch (de)
-
-Weitere Sprachen kannst in unseren International Forum finden: http://www.board3.de/viewforum.php?f=13
-</description>
-
-		<author-notes lang="en">I hope you get everything working. Further developement, new boxes for the portal or questions are welcome at www.board3.de
-		</author-notes>
-		<author-notes lang="de">Ich hoffe ihr habt Spaß am Portal. Neuen Code, bzw neue Boxen und Fragen könnt ihr auf www.board3.de posten.
-		</author-notes>
-		<github>https://github.com/board3/Board3-Portal</github>
-		<author-group>
-			<author>
-				<realname>Marc Alexander</realname>
-				<username>Marc</username>
-				<email>admin@m-a-styles.de</email>
-				<homepage>http://www.m-a-styles.de</homepage>
-				<contributions-group>
-					<contributions status="current" position="Main-Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Joas Schilling</realname>
-				<email>nickvergessen@gmx.de</email>
-				<username>nickvergessen</username>
-				<homepage>http://mods.flying-bits.org/</homepage>
-				<contributions-group>
-					<contributions status="current" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Kevin</realname>
-				<username>saint_hh</username>
-				<homepage>http://www.board3.de</homepage>
-				<contributions-group>
-					<contributions status="current" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Ice</realname>
-				<username>avaren</username>
-				<homepage>http://www.board3.de</homepage>
-				<contributions-group>
-					<contributions status="past" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Christian</realname>
-				<username>Christian_N</username>
-				<homepage>http://www.phpbb-projekt.de</homepage>
-				<contributions-group>
-					<contributions status="past" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Walter</realname>
-				<email>w.bobeth@digitalfotografie-foren.de</email>
-				<username>Redbull254</username>
-				<homepage>http://www.digitalfotografie-foren.de</homepage>
-				<contributions-group>
-					<contributions status="past" position="Developer"></contributions>
-				</contributions-group>
-			 </author>
-		</author-group>
-
-		<mod-version>2.0.2</mod-version>
-
-		<installation>
-			<level>easy</level>
-			<time>120</time>
-			<target-version>3.0.12</target-version>
-		</installation>
-
-		<link-group>
-			<link type="parent" lang="de" href="../../install.xml">Installations-Anleitung</link>
-			<link type="parent" lang="en" href="../../install.xml">Manual</link>
-			<link type="template" lang="en" href="contrib/subsilver2.xml">Update subsilver2 to Board3 Portal 2.0.2</link>
-			<link type="template" lang="de" href="contrib/subsilver2.xml">Aktualisiere subsilver2 für Board3 Portal 2.0.2</link>
-			<link type="language" lang="en" href="contrib/de.xml">Update German language to Board3 Portal 2.0.2</link>
-			<link type="language" lang="de" href="contrib/de.xml">Aktualisiere deutsche Sprachdateien für Board3 Portal 2.0.2</link>
-		</link-group>	
-	</header>
-	<action-group>
-		<copy>
-			<file from="root/adm/style/portal/acp_portal.js" to="adm/style/portal/acp_portal.js" />
-			<file from="root/adm/style/portal/acp_portal_custom.html" to="adm/style/portal/acp_portal_custom.html" />
-			<file from="root/adm/style/portal/acp_portal_welcome.html" to="adm/style/portal/acp_portal_welcome.html" />
-			<file from="root/includes/acp/acp_portal.php" to="includes/acp/acp_portal.php" />
-			<file from="root/install/index.php" to="install/index.php" />
-			<file from="root/language/en/mods/*.*" to="language/en/mods/*.*" />
-			<file from="root/portal/includes/functions.php" to="portal/includes/functions.php" />
-			<file from="root/portal/includes/functions_upload.php" to="portal/includes/functions_upload.php" />
-			<file from="root/portal/modules/*.*" to="portal/modules/*.*" />
-			<file from="root/styles/prosilver/template/portal/modules/*.*" to="styles/prosilver/template/portal/modules/*.*" />
-			<file from="root/styles/prosilver/theme/portal.css" to="styles/prosilver/theme/portal.css" />
-			<file from="root/umil/*.*" to="umil/*.*" />
-			<file from="root/portal.php" to="portal.php" />
-		</copy>
-		<php-installer>install/index.php</php-installer>
-		<diy-instructions lang="de"><![CDATA[Rufe install/index.php auf und führe den Installer aus.]]></diy-instructions>
-		<diy-instructions lang="en"><![CDATA[Browse to install/index.php and run the installer.]]></diy-instructions>
-	</action-group>
-</mod>

controller/helper.php

@@ -0,0 +1,257 @@
+<?php
+/**
+*
+* @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
+*
+*/
+
+namespace board3\portal\controller;
+
+class helper
+{
+	/**
+	* Auth object
+	* @var \phpbb\auth\auth
+	*/
+	protected $auth;
+
+	/**
+	* phpBB Config object
+	* @var \phpbb\config\config
+	*/
+	protected $config;
+
+	/**
+	* Template object
+	* @var \phpbb\template
+	*/
+	protected $template;
+
+	/**
+	* User object
+	* @var \phpbb\user
+	*/
+	protected $user;
+
+	/**
+	* phpBB root path
+	* @var string
+	*/
+	protected $phpbb_root_path;
+
+	/**
+	* PHP file extension
+	* @var string
+	*/
+	protected $php_ext;
+
+	/**
+	* Portal root path
+	* @var string
+	*/
+	protected $root_path;
+
+	/**
+	* phpBB path helper
+	* @var \phpbb\path_helper
+	*/
+	protected $path_helper;
+
+	/**
+	* Portal Helper object
+	* @var \board3\portal\includes\helper
+	*/
+	protected $portal_helper;
+
+	/**
+	* Portal modules array
+	* @var array
+	*/
+	protected $portal_modules;
+
+	/**
+	* Constructor
+	* NOTE: The parameters of this method must match in order and type with
+	* the dependencies defined in the services.yml file for this service.
+	* @param \phpbb\auth\auth $auth Auth object
+	* @param \phpbb\config\config $config phpBB Config object
+	* @param \phpbb\template $template Template object
+	* @param \phpbb\user $user User object
+	* @param \phpbb\path_helper $path_helper phpBB path helper
+	* @param \board3\portal\includes\helper $portal_helper Portal helper class
+	* @param string $phpbb_root_path phpBB root path
+	* @param string $php_ext PHP file extension
+	*/
+	public function __construct($auth, $config, $template, $user, $path_helper, $portal_helper, $phpbb_root_path, $php_ext)
+	{
+		$this->auth = $auth;
+		$this->config = $config;
+		$this->template = $template;
+		$this->user = $user;
+		$this->path_helper = $path_helper;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+		$this->portal_helper = $portal_helper;
+
+		$this->root_path = $phpbb_root_path . 'ext/board3/portal/';
+	}
+
+	/**
+	* Check if user should be able to access this page. Redirect to index
+	* if this does not apply.
+	*
+	* @return null
+	*/
+	protected function check_permission()
+	{
+		if (!isset($this->config['board3_enable']) || !$this->config['board3_enable'] || !$this->auth->acl_get('u_view_portal'))
+		{
+			redirect(append_sid($this->phpbb_root_path . 'index' . $this->php_ext));
+		}
+	}
+
+	/**
+	* Return true if online list should be displayed
+	*
+	* @return mixed True if online list should be display, current value
+	*		if unsure
+	*/
+	public function check_online_list($module_classname, $display_online)
+	{
+		return ($module_classname === '\board3\portal\modules\whois_online') ? true : $display_online;
+	}
+
+	/**
+	* Get portal module and run module start checks
+	*
+	* @param array $row Module row
+	*
+	* @return mixed False if one of the module checks failed, the module
+	*		object if checks were successful
+	*/
+	public function get_portal_module($row)
+	{
+		// Do not try to load non-existent or disabled modules
+		if ($row['module_status'] == B3_MODULE_DISABLED || !is_object($module = $this->portal_helper->get_module($row['module_classname'])))
+		{
+			return false;
+		}
+
+		// Check if module shouldn't be loaded
+		if ($this->check_column_disabled($row))
+		{
+			return false;
+		}
+
+		/**
+		* Check for permissions before loading anything
+		* the default group of a user always defines his/her permission
+		*/
+		return ($this->check_group_access($row)) ? $module : false;
+	}
+
+	/**
+	* Check if column is disabled
+	*
+	* @param array $row Module database row
+	*
+	* @return bool False if column is not disabled, true if it is
+	*/
+	protected function check_column_disabled($row)
+	{
+		return ($this->config['board3_left_column'] === false && column_num_string($row['module_column']) === 'left') || ($this->config['board3_right_column'] === false && column_num_string($row['module_column']) === 'right');
+	}
+
+	/**
+	* Check if user is in required groups
+	*
+	* @param array $row Module row
+	*/
+	protected function check_group_access($row)
+	{
+		$group_ary = (!empty($row['module_group_ids'])) ? explode(',', $row['module_group_ids']) : '';
+		if ((is_array($group_ary) && !in_array($this->user->data['group_id'], $group_ary)))
+		{
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	/**
+	* Load language file of module
+	*
+	* @param object $module Module of which language file should be loaded
+	*/
+	public function load_module_language($module)
+	{
+		if ($language_file = $module->get_language())
+		{
+			// 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);
+			}
+		}
+	}
+
+	/**
+	* Assign module's template vars
+	*
+	* @param array $row Database row of module
+	* @param mixed $template_module Template data as returned by module
+	*
+	* @return null
+	*/
+	public function assign_module_vars($row, $template_module)
+	{
+		if (is_array($template_module))
+		{
+			$this->template->assign_block_vars('modules_' . column_num_string($row['module_column']), array(
+				'TEMPLATE_FILE'			=> 'portal/modules/' . $template_module['template'],
+				'IMAGE_SRC'			=> $this->path_helper->get_web_root_path() . $this->root_path . 'styles/' . $this->user->style['style_path'] . '/theme/images/portal/' . $template_module['image_src'],
+				'TITLE'				=> $template_module['title'],
+				'CODE'				=> $template_module['code'],
+				'MODULE_ID'			=> $row['module_id'],
+				'IMAGE_WIDTH'			=> $row['module_image_width'],
+				'IMAGE_HEIGHT'			=> $row['module_image_height'],
+			));
+		}
+		else
+		{
+			$this->template->assign_block_vars('modules_' . column_num_string($row['module_column']), array(
+				'TEMPLATE_FILE'			=> 'portal/modules/' . $template_module,
+				'IMAGE_SRC'			=> $this->path_helper->get_web_root_path() . $this->root_path . 'styles/' . $this->user->style['style_path'] . '/theme/images/portal/' . $row['module_image_src'],
+				'IMAGE_WIDTH'			=> $row['module_image_width'],
+				'IMAGE_HEIGHT'			=> $row['module_image_height'],
+				'MODULE_ID'			=> $row['module_id'],
+				'TITLE'				=> (isset($this->user->lang[$row['module_name']])) ? $this->user->lang[$row['module_name']] : utf8_normalize_nfc($row['module_name']),
+			));
+		}
+	}
+
+	/**
+	* Run initial tasks that are required for a properly setup extension
+	*
+	* @return null
+	*/
+	public function run_initial_tasks()
+	{
+		// Check for permissions first
+		$this->check_permission();
+
+		// Load language file
+		$this->user->add_lang_ext('board3/portal', 'portal');
+
+		// Obtain portal config
+		obtain_portal_config();
+	}
+}

controller/main.php

@@ -0,0 +1,282 @@
+<?php
+/**
+*
+* @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
+*
+*/
+
+namespace board3\portal\controller;
+
+class main
+{
+	/**
+	* phpBB Config object
+	* @var \phpbb\config\config
+	*/
+	protected $config;
+
+	/**
+	* Board3 Portal controller helper
+	* @var \board3\portal\controller\helper
+	*/
+	protected $controller_helper;
+
+	/**
+	* Template object
+	* @var \phpbb\template
+	*/
+	protected $template;
+
+	/**
+	* User object
+	* @var \phpbb\user
+	*/
+	protected $user;
+
+	/**
+	* phpBB root path
+	* @var string
+	*/
+	protected $phpbb_root_path;
+
+	/**
+	* PHP file extension
+	* @var string
+	*/
+	protected $php_ext;
+
+	/**
+	* Portal root path
+	* @var string
+	*/
+	protected $root_path;
+
+	/**
+	* Portal includes path
+	* @var string
+	*/
+	protected $includes_path;
+
+	/**
+	* phpBB path helper
+	* @var \phpbb\path_helper
+	*/
+	protected $path_helper;
+
+	/**
+	* Portal modules count
+	* @var array
+	*/
+	protected $module_count;
+
+	/**
+	* Portal modules array
+	* @var array
+	*/
+	protected $portal_modules;
+
+	/**
+	* Constructor
+	* NOTE: The parameters of this method must match in order and type with
+	* the dependencies defined in the services.yml file for this service.
+	* @param \phpbb\config\config $config phpBB Config object
+	* @param \board3\portal\controller\helper $controller_helper Controller helper
+	* @param \phpbb\template $template Template object
+	* @param \phpbb\user $user User object
+	* @param \phpbb\path_helper $path_helper phpBB path helper
+	* @param string $phpbb_root_path phpBB root path
+	* @param string $php_ext PHP file extension
+	* @param string $config_table Board3 config table
+	* @param string $modules_table Board3 modules table
+	*/
+	public function __construct($config, $controller_helper, $template, $user, $path_helper, $phpbb_root_path, $php_ext, $config_table, $modules_table)
+	{
+		global $portal_root_path;
+
+		$this->config = $config;
+		$this->controller_helper = $controller_helper;
+		$this->template = $template;
+		$this->user = $user;
+		$this->path_helper = $path_helper;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+
+		$this->includes_path = $phpbb_root_path . 'ext/board3/portal/includes/';
+		$this->root_path = $phpbb_root_path . 'ext/board3/portal/';
+		$portal_root_path = $this->root_path;
+		define('PORTAL_MODULES_TABLE', $modules_table);
+		define('PORTAL_CONFIG_TABLE', $config_table);
+
+		if (!function_exists('obtain_portal_config'))
+		{
+			include($this->includes_path . 'constants' . $this->php_ext);
+			include($this->includes_path . 'functions_modules' . $this->php_ext);
+			include($this->includes_path . 'functions' . $this->php_ext);
+		}
+	}
+
+	/**
+	* Extension front handler method. This is called automatically when your extension is accessed
+	* through index.php?ext=example/foobar
+	* @return null
+	*/
+	public function handle()
+	{
+		$this->controller_helper->run_initial_tasks();
+
+		// Set default data
+		$this->portal_modules = obtain_portal_modules();
+		$display_online = false;
+
+		/**
+		* set up column_count array
+		* with this we can hide unneeded parts of the portal
+		*/
+		$this->module_count = array(
+			'total' 	=> 0,
+			'top'		=> 0,
+			'left'		=> 0,
+			'center'	=> 0,
+			'right'		=> 0,
+			'bottom'	=> 0,
+		);
+
+		/**
+		* start assigning block vars
+		*/
+		foreach ($this->portal_modules as $row)
+		{
+			if (!($module = $this->controller_helper->get_portal_module($row)))
+			{
+				continue;
+			}
+
+			// Load module language file
+			$this->controller_helper->load_module_language($module);
+
+			$template_module = $this->get_module_template($row, $module);
+
+			if (empty($template_module))
+			{
+				continue;
+			}
+
+			// Custom Blocks that have been defined in the ACP will return an array instead of just the name of the template file
+			$this->controller_helper->assign_module_vars($row, $template_module);
+
+			// Check if we need to show the online list
+			$display_online = $this->controller_helper->check_online_list($row['module_classname'], $display_online);
+
+			unset($template_module);
+		}
+
+		// Redirect to index if there are currently no active modules
+		$this->check_redirect();
+
+		// Assign specific vars
+		$this->assign_template_vars();
+
+		// And now to output the page.
+		page_header($this->user->lang('PORTAL'), $display_online);
+
+		// foobar_body.html is in ./ext/foobar/example/styles/prosilver/template/foobar_body.html
+		$this->template->set_filenames(array(
+			'body' => 'portal/portal_body.html'
+		));
+
+		$this->make_jumpbox($this->config['board3_display_jumpbox']);
+
+		page_footer();
+	}
+
+	/**
+	* Get module's template
+	*
+	* @param array $row Database row of module
+	* @param object $module Module object
+	*
+	* @return mixed False if module is not inside possible columns or if
+	*		module shouldn't be shown, otherwise module's template
+	*/
+	public function get_module_template($row, $module)
+	{
+		$template_module = false;
+		$column = column_num_string($row['module_column']);
+
+		if (in_array($column, array('left', 'right')) && $this->config['board3_' . $column . '_column'])
+		{
+			++$this->module_count[$column];
+			$template_module = $module->get_template_side($row['module_id']);
+		}
+		else if (in_array($column, array('top', 'center', 'bottom')))
+		{
+			++$this->module_count[$column];
+			$template_module = $module->get_template_center($row['module_id']);
+		}
+
+		return $template_module;
+	}
+
+	/**
+	* Check if portal needs to redirect to index page
+	*/
+	protected function check_redirect()
+	{
+		$this->module_count['total'] = sizeof($this->portal_modules);
+
+		if ($this->module_count['total'] < 1)
+		{
+			redirect(append_sid($this->phpbb_root_path . 'index' . $this->php_ext));
+		}
+	}
+
+	/**
+	* Assign template vars for portal
+	*
+	* @return null
+	*/
+	protected function assign_template_vars()
+	{
+		$this->template->assign_vars(array(
+			'S_PORTAL_LEFT_COLUMN'		=> $this->config['board3_left_column_width'],
+			'S_PORTAL_RIGHT_COLUMN'		=> $this->config['board3_right_column_width'],
+			'S_LEFT_COLUMN'			=> $this->check_module_count('left', $this->config['board3_left_column']),
+			'S_CENTER_COLUMN'		=> $this->check_module_count('center'),
+			'S_RIGHT_COLUMN'		=> $this->check_module_count('right', $this->config['board3_right_column']),
+			'S_TOP_COLUMN'			=> $this->check_module_count('top'),
+			'S_BOTTOM_COLUMN'		=> $this->check_module_count('bottom'),
+			'S_DISPLAY_PHPBB_MENU'		=> $this->config['board3_phpbb_menu'],
+			'B3P_DISPLAY_JUMPBOX'		=> $this->config['board3_display_jumpbox'],
+			'T_EXT_THEME_PATH'		=> $this->path_helper->get_web_root_path() . $this->root_path . 'styles/' . $this->user->style['style_path'] . '/theme/',
+		));
+	}
+
+	/**
+	* Check module count and related config setting
+	*
+	* @param string $column Column to check
+	* @param bool $config Config value to check
+	*
+	* @return bool True if module count is bigger than 0 and $config is true
+	*/
+	protected function check_module_count($column, $config = true)
+	{
+		return $this->module_count[$column] > 0 && $config;
+	}
+
+	/**
+	* Wrapper method for running make_jumpbox
+	*
+	* @param bool $display Whether jumpbox should be displayed
+	* @return null
+	*/
+	protected function make_jumpbox($display = false)
+	{
+		if ($display)
+		{
+			make_jumpbox(append_sid("{$this->phpbb_root_path}viewforum{$this->php_ext}"));
+		}
+	}
+}

event/listener.php

@@ -0,0 +1,139 @@
+<?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\event;
+
+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;
+
+	/** @var \phpbb\path_helper */
+	protected $path_helper;
+
+	/** @var \phpbb\template\template */
+	protected $template;
+
+	/** @var \phpbb\user */
+	protected $user;
+
+	/** @var string phpEx */
+	protected $php_ext;
+
+	/**
+	* 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\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;
+		$this->user = $user;
+		$this->php_ext = $php_ext;
+	}
+
+	/**
+	* Assign functions defined in this class to event listeners in the core
+	*
+	* @return array
+	*/
+	static public function getSubscribedEvents()
+	{
+		return array(
+			'core.user_setup'			=> 'load_portal_language',
+			'core.viewonline_overwrite_location'	=> 'viewonline_page',
+			'core.page_header'			=> 'add_portal_link',
+		);
+	}
+
+	/**
+	* Load portal language during user setup
+	*
+	* @param object $event The event object
+	* @return null
+	*/
+	public function load_portal_language($event)
+	{
+		$lang_set_ext = $event['lang_set_ext'];
+		$lang_set_ext[] = array(
+			'ext_name' => 'board3/portal',
+			'lang_set' => 'portal',
+		);
+		$event['lang_set_ext'] = $lang_set_ext;
+	}
+
+	/**
+	* Show users as viewing the portals on Who Is Online page
+	*
+	* @param object $event The event object
+	* @return null
+	*/
+	public function viewonline_page($event)
+	{
+		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/portal') === 0)
+		{
+			$event['location'] = $this->user->lang('VIEWING_PORTAL');
+			$event['location_url'] = $this->controller_helper->route('board3_portal_controller');
+		}
+	}
+
+	/**
+	* 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');
+		}
+		else
+		{
+			$portal_link = $this->path_helper->remove_web_root_path($this->controller_helper->route('board3_portal_controller'));
+		}
+
+		$this->template->assign_vars(array(
+			'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'];
+	}
+}

ext.php

@@ -0,0 +1,16 @@
+<?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
+*
+*/
+
+// This file is needed for phpBB3 to properly register the extension
+
+namespace board3\portal;
+
+class ext extends \phpbb\extension\base
+{
+}

git-tools/hooks/commit-msg

@@ -0,0 +1,342 @@
+#!/bin/sh
+#
+# A hook to check for correct syntax similar to phpBB3 commit messages per:
+# * <http://wiki.phpbb.com/display/DEV/Git>
+# * <http://area51.phpbb.com/phpBB/viewtopic.php?p=209919#p209919>
+#
+# This is a commit-msg hook.
+#
+# To install this you can either copy or symlink it to
+# $GIT_DIR/hooks
+
+config_ns="b3p.hooks.commit-msg";
+
+if [ "$(git config --bool $config_ns.fatal)" = "true" ]
+then
+	fatal=1;
+	severity=Error;
+else
+	fatal=0;
+	severity=Warning;
+fi
+
+debug_level=$(git config --int $config_ns.debug || echo 0);
+
+# Error codes
+ERR_LENGTH=1;
+ERR_HEADER=2;
+ERR_EMPTY=3;
+ERR_DESCRIPTION=4;
+ERR_FOOTER=5;
+ERR_EOF=6;
+ERR_UNKNOWN=42;
+
+debug()
+{
+	local level;
+
+	level=$1;
+	shift;
+
+	if [ $debug_level -ge $level ]
+	then
+		echo $@;
+	fi
+}
+
+quit()
+{
+	if [ $1 -eq 0 ] || [ $1 -eq $ERR_UNKNOWN ]
+	then
+		# success
+		exit 0;
+	elif [ $fatal -eq 0 ]
+	then
+		# problems found but fatal is false
+		complain 'Please run `git commit --amend` and fix the problems mentioned.' 1>&2
+		exit 0;
+	else
+		complain "Aborting commit." 1>&2
+		exit $1;
+	fi
+}
+
+use_color()
+{
+	if [ -z "$use_color_cached" ]
+	then
+		case $(git config --bool $config_ns.color)
+		in
+		false)
+			use_color_cached=1
+			;;
+		true)
+			use_color_cached=0
+			;;
+		*)
+			# tty detection in shell:
+			# http://hwi.ath.cx/jsh/list/shext/isatty.sh.html
+			tty 0>/dev/stdout >/dev/null 2>&1
+			use_color_cached=$?
+			;;
+		esac
+	fi
+	# return value is the flag inverted -
+	# if return value is 0, this means use color
+	return $use_color_cached
+}
+
+complain()
+{
+	if use_color
+	then
+		# Careful: our argument may include arguments to echo like -n
+		# ANSI color codes:
+		# http://pueblo.sourceforge.net/doc/manual/ansi_color_codes.html
+		printf "\033[31m\033[1m"
+		if [ "$1" = "-n" ]
+		then
+			echo "$@"
+			printf "\033[0m"
+		else
+			# This will print one trailing space.
+			# Not sure how to avoid this at the moment.
+			echo "$@" $(printf "\033[0m")
+		fi
+	else
+		echo "$@"
+	fi
+}
+
+# Check for empty commit message
+if ! grep -qv '^#' "$1"
+then
+	# Commit message is empty (or contains only comments).
+	# Let git handle this.
+	# It will abort with a message like so:
+	#
+	# Aborting commit due to empty commit message.
+	exit 0
+fi
+
+msg=$(grep -v '^#' "$1" |grep -nE '.{81,}')
+
+if [ $? -eq 0 ]
+then
+	complain "The following lines are greater than 80 characters long:" >&2;
+	complain >&2
+	complain "$msg" >&2;
+
+	quit $ERR_LENGTH;
+fi
+
+lines=$(wc -l "$1" | awk '{ print $1; }');
+expecting=header;
+in_description=0;
+in_empty=0;
+ticket=0;
+branch_regex="[a-z]+[a-z0-9-]*[a-z0-9]+";
+i=1;
+tickets="";
+
+while [ $i -le $lines ]
+do
+	# Grab the line we are studying
+	line=$(head -n$i "$1" | tail -n1);
+
+	debug 1 "==> [$i] $line (description: $in_description, empty: $in_empty)";
+
+	err=$ERR_UNKNOWN;
+
+	if [ -z "$expecting" ]
+	then
+		quit $err;
+	fi
+
+	if [ "${expecting#comment}" = "$expecting" ]
+	then
+		# Prefix comments to the expected tokens list
+		expecting="comment $expecting";
+	fi
+
+	debug 2 "Expecting: $expecting";
+
+	# Loop over each of the expected line formats
+	for expect in $expecting
+	do
+		# Reset the error code each iteration
+		err=$ERR_UNKNOWN;
+
+		# Test for validity of each line format
+		# This is done first so $? contains the result
+		case $expect in
+			"header")
+				err=$ERR_HEADER;
+				echo "$line" | grep -Eq "^\[(ticket/[0-9]+|feature/$branch_regex|task/$branch_regex)\] .+$"
+				result=$?
+				if ! echo "$line" | grep -Eq "^\[(ticket/[0-9]+|feature/$branch_regex|task/$branch_regex)\] [A-Z].+$"
+				then
+					# Don't be too strict.
+					# Commits may be temporary, intended to be squashed later.
+					# Just issue a warning here.
+					complain "$severity: heading should be a sentence beginning with a capital letter." 1>&2
+					complain "You entered:" 1>&2
+					complain "$line" 1>&2
+				fi
+				# restore exit code
+				(exit $result)
+			;;
+			"empty")
+				err=$ERR_EMPTY;
+				echo "$line" | grep -Eq "^$"
+			;;
+			"description")
+				err=$ERR_DESCRIPTION;
+				# Free flow text, the line length was constrained by the initial check
+				echo "$line" | grep -Eq "^.+$";
+			;;
+			"footer")
+				err=$ERR_FOOTER;
+				# Each ticket is on its own line
+				echo "$line" | grep -Eq "^B3P-[0-9]+$";
+			;;
+			"eof")
+				err=$ERR_EOF;
+				# Should not end up here
+				false
+			;;
+			"possibly-eof")
+				# Allow empty and/or comment lines at the end
+				! tail -n +"$i" "$1" |grep -qvE '^($|#)'
+			;;
+			"comment")
+				echo "$line" | grep -Eq "^#";
+			;;
+			*)
+				complain "Unrecognised token $expect" >&2;
+				quit $err;
+			;;
+		esac
+
+		# Preserve the result of the line check
+		result=$?;
+
+		debug 2 "$expect - '$line' - $result";
+
+		if [ $result -eq 0 ]
+		then
+			# Break out the loop on success
+			# otherwise roll on round and keep looking for a match
+			break;
+		fi
+	done
+
+	if [ $result -eq 0 ]
+	then
+		# Have we switched out of description mode?
+		if [ $in_description -eq 1 ] && [ "$expect" != "description" ] && [ "$expect" != "empty" ] && [ "$expect" != "comment" ]
+		then
+			# Yes, okay we need to backtrace one line and reanalyse
+			in_description=0;
+			i=$(( $i - $in_empty ));
+
+			# Reset the empty counter
+			in_empty=0;
+			continue;
+		fi
+
+		# Successful match, but on which line format
+		case $expect in
+			"header")
+				expecting="empty";
+
+				echo "$line" | grep -Eq "^\[ticket/[0-9]+\]$" && (
+					ticket=$(echo "$line" | sed 's,\[ticket/\([0-9]*\)\].*,\1,');
+				)
+			;;
+			"empty")
+				# Description might have empty lines as spacing
+				expecting="footer description";
+				in_empty=$(($in_empty + 1));
+
+				if [ $in_description -eq 1 ]
+				then
+					expecting="$expecting empty";
+				fi
+			;;
+			"description")
+				expecting="description empty";
+				in_description=1;
+			;;
+			"footer")
+				expecting="footer possibly-eof";
+				if [ "$tickets" = "" ]
+				then
+					tickets="$line";
+				else
+					tickets="$tickets $line";
+				fi
+			;;
+			"comment")
+				# Comments should expect the same thing again
+			;;
+			"possibly-eof")
+				expecting="eof";
+			;;
+			*)
+				complain "Unrecognised token $expect" >&2;
+				quit 254;
+			;;
+		esac
+
+		if [ "$expect" != "empty" ]
+		then
+			in_empty=0;
+		fi
+
+		debug 3 "Now expecting: $expecting";
+	else
+		# None of the expected line formats matched
+		# Guess we'll call it a day here then
+		complain "Syntax error on line $i:" >&2;
+		complain ">> $line" >&2;
+		complain -n "Expecting: " >&2;
+		complain "$expecting" | sed 's/ /, /g' >&2;
+		quit $err;
+	fi
+
+	i=$(( $i + 1 ));
+done
+
+# If EOF is expected exit cleanly
+echo "$expecting" | grep -q "eof" || (
+	# Unexpected EOF, error
+	complain "Unexpected EOF encountered" >&2;
+	quit $ERR_EOF;
+) && (
+	# Do post scan checks
+	if [ ! -z "$tickets" ]
+	then
+		# Check for duplicate tickets
+		dupes=$(echo "$tickets" | sed 's/ /\n/g' | sort | uniq -d);
+
+		if [ ! -z "$dupes" ]
+		then
+			complain "The following tickets are repeated:" >&2;
+			complain "$dupes" | sed 's/ /\n/g;s/^/* /g' >&2;
+			quit $ERR_FOOTER;
+		fi
+	fi
+	# Check the branch ticket is mentioned, doesn't make sense otherwise
+	if [ $ticket -gt 0 ]
+	then
+		echo "$tickets" | grep -Eq "\bB3P-$ticket\b" || (
+			complain "Ticket ID [$ticket] of branch missing from list of tickets:" >&2;
+			complain "$tickets" | sed 's/ /\n/g;s/^/* /g' >&2;
+			quit $ERR_FOOTER;
+		) || exit $?;
+	fi
+	# Got here okay exit to reality
+	exit 0;
+);
+exit $?;

git-tools/hooks/pre-commit

@@ -0,0 +1,88 @@
+#!/bin/sh
+#
+# A hook to disallow php syntax errors to be committed
+# by running php -l (lint) on them. It requires php-cli
+# to be installed.
+#
+# This is a pre-commit hook.
+#
+# To install this you can either copy or symlink it to
+# $GIT_DIR/hooks, example:
+#
+# ln -s ../../git-tools/hooks/pre-commit \\
+#   .git/hooks/pre-commit
+
+if [ -z "$PHP_BIN" ]
+then
+	PHP_BIN=php
+fi
+
+if [ "$(echo -e test)" = test ]
+then
+	echo_e="echo -e"
+else
+	echo_e="echo"
+fi
+
+# necessary check for initial commit
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+errors=""
+if ! which "$PHP_BIN" >/dev/null 2>&1
+then
+	echo "PHP Syntax check failed:"
+	echo "PHP binary does not exist or is not in path: $PHP_BIN"
+	exit 1
+fi
+
+# dash does not support $'\n':
+# http://forum.soft32.com/linux2/Bug-409179-DASH-Settings-IFS-work-properly-ftopict70039.html
+IFS='
+'
+# get a list of staged files
+for line in $(git diff-index --cached --full-index $against)
+do
+	# split needed values
+	sha=$(echo $line | cut -d' ' -f4)
+	temp=$(echo $line | cut -d' ' -f5)
+	status=$(echo $temp | cut -d'	' -f1)
+	filename=$(echo $temp | cut -d'	' -f2)
+
+	# file extension
+	ext=$(echo $filename | sed 's/^.*\.//')
+
+	# only check files with php extension
+	if [ $ext != "php" ]
+	then
+		continue
+	fi
+
+	# do not check deleted files
+	if [ $status = "D" ]
+	then
+		continue
+	fi
+
+	# check the staged file content for syntax errors
+	# using php -l (lint)
+	result=$(git cat-file -p $sha | "$PHP_BIN" -n -l -ddisplay_errors\=1 -derror_reporting\=E_ALL -dlog_errrors\=0 2>&1)
+	if [ $? -ne 0 ]
+	then
+		# Swap back in correct filenames
+		errors=$(echo "$errors"; echo "$result" | grep ':' | sed -e "s@in - on@in $filename on@g")
+	fi
+done
+unset IFS
+
+if [ -n "$errors" ]
+then
+	echo "PHP Syntax check failed: "
+	$echo_e "$errors"
+	exit 1
+fi

git-tools/hooks/prepare-commit-msg

@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# A hook to add [$branch] to the beginning of a commit message
+# if certain conditions are met.
+#
+# This is a prepare-commit-msg hook.
+#
+# To install this you can either copy or symlink it to
+# $GIT_DIR/hooks, example:
+#
+# ln -s ../../git-tools/hooks/prepare-commit-msg \\
+#   .git/hooks/prepare-commit-msg
+
+# get branch name
+branch="$(git symbolic-ref HEAD)"
+
+# exit if no branch name is present
+# (eg. detached HEAD)
+if [ $? -ne 0 ]
+then
+	exit
+fi
+
+# strip off refs/heads/
+branch="$(echo "$branch" | sed "s/refs\/heads\///g")"
+
+# add [branchname] to commit message
+# * only run when normal commit is made (without -m or -F;
+#   not a merge, etc.)
+# * also make sure the branch name begins with bug/ or feature/
+if [ "$2" = "" ]
+then
+	tail="";
+
+	# Branch is prefixed with 'ticket/', append ticket ID to message
+	if [ "$branch" != "${branch##ticket/}" ];
+	then
+		tail="$(printf "\n\nB3P-${branch##ticket/}")";
+	fi
+
+	echo "[$branch] $tail$(cat "$1")" > "$1"
+fi

includes/constants.php

@@ -0,0 +1,15 @@
+<?php
+/**
+*
+* @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
+*
+*/
+
+// Config constants
+define('B3_MODULE_DISABLED', 0);
+define('B3_MODULE_ENABLED', 1);
+
+// Tables and paths
+define('PORTAL_ROOT_PATH', 'portal/');

includes/functions.php

@@ -0,0 +1,494 @@
+<?php
+/**
+*
+* @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
+*
+*/
+
+// Get portal config
+function obtain_portal_config()
+{
+	global $db, $cache, $portal_config;
+
+	if (($portal_config = $cache->get('portal_config')) === false)
+	{
+		$portal_config = $portal_cached_config = array();
+
+		$sql = 'SELECT config_name, config_value
+			FROM ' . PORTAL_CONFIG_TABLE;
+		$result = $db->sql_query($sql);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$portal_cached_config[$row['config_name']] = $row['config_value'];
+
+			$portal_config[$row['config_name']] = $row['config_value'];
+		}
+		$db->sql_freeresult($result);
+
+		$cache->put('portal_config', $portal_cached_config);
+	}
+
+	return $portal_config;
+}
+
+/**
+* Set config value. Creates missing config entry.
+* Only use this if your config value might exceed 255 characters, otherwise please use set_config
+*/
+function set_portal_config($config_name, $config_value)
+{
+	global $db, $cache, $portal_config;
+
+	$sql = 'UPDATE ' . PORTAL_CONFIG_TABLE . "
+		SET config_value = '" . $db->sql_escape($config_value) . "'
+		WHERE config_name = '" . $db->sql_escape($config_name) . "'";
+	$db->sql_query($sql);
+
+	if (!$db->sql_affectedrows() && !isset($portal_config[$config_name]))
+	{
+		$sql = 'INSERT INTO ' . PORTAL_CONFIG_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+			'config_name'	=> $config_name,
+			'config_value'	=> $config_value));
+		$db->sql_query($sql);
+	}
+
+	$portal_config[$config_name] = $config_value;
+
+	$cache->destroy('portal_config');
+}
+
+/**
+* Get portal modules
+*/
+function obtain_portal_modules()
+{
+	global $db, $cache, $portal_modules;
+
+	if (($portal_modules = $cache->get('portal_modules')) === false || defined('DEBUG'))
+	{
+		$portal_modules = $portal_cached_modules = array();
+
+		$sql = 'SELECT *
+			FROM ' . PORTAL_MODULES_TABLE . '
+			ORDER BY module_order ASC';
+		$result = $db->sql_query($sql);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$portal_cached_modules[] = $row;
+
+			$portal_modules[] = $row;
+		}
+		$db->sql_freeresult($result);
+
+		$cache->put('portal_modules', $portal_cached_modules);
+	}
+
+	return $portal_modules;
+}
+
+/**
+* Fetch post for news & announce
+*
+* @deprecated 2.1.0-b1 (To be removed: 2.2.0)
+*/
+function phpbb_fetch_posts($module_id, $forum_from, $permissions, $number_of_posts, $text_length, $time, $type, $start = 0, $invert = false)
+{
+	global $phpbb_container;
+
+	$fetch_posts = $phpbb_container->get('board3.portal.fetch_posts');
+	$fetch_posts->set_module_id($module_id);
+
+	return $fetch_posts->get_posts($forum_from, $permissions, $number_of_posts, $text_length, $time, $type, $start, $invert);
+}
+
+/**
+* Censor title, return short title
+*
+* @param $title string title to censor
+* @param $limit int short title character limit
+*
+*/
+function character_limit(&$title, $limit = 0)
+{
+	$title = censor_text($title);
+	if ($limit > 0)
+	{
+		return (strlen(utf8_decode($title)) > $limit + 3) ? truncate_string($title, $limit) . '...' : $title;
+	}
+	else
+	{
+		return $title;
+	}
+}
+
+/**
+* Cut post text to given length
+*
+* @param string $message post text
+* @param string $bbcode_uid bbcode uid
+* @param int $length The desired length
+*
+* @return string Shortened message
+*/
+function get_sub_taged_string($message, $bbcode_uid, $length)
+{
+	if (class_exists('\Nickvergessen\TrimMessage\TrimMessage'))
+	{
+		$trim = new \Nickvergessen\TrimMessage\TrimMessage($message, $bbcode_uid, $length);
+		$message = $trim->message();
+		unset($trim);
+	}
+
+	return $message;
+}
+
+function ap_validate($str)
+{
+	$s = str_replace('<br />', '<br/>', $str);
+	return str_replace('</li><br/>', '</li>', $s);
+}
+
+/**
+* Pagination routine, generates archive number sequence
+*/
+function generate_portal_pagination($base_url, $num_items, $per_page, $start_item, $type, $add_prevnext_text = false, $tpl_prefix = '')
+{
+	global $template, $user;
+
+	switch ($type)
+	{
+		case "announcements":
+			$pagination_type = 'ap';
+			$anker = '#a';
+		break;
+		case "news":
+		case "news_all":
+			$pagination_type = 'np';
+			$anker = '#n';
+		break;
+
+		default:
+			// this shouldn't happen but default to announcements
+			$pagination_type = 'ap';
+			$anker = '#a';
+	}
+
+	// Make sure $per_page is a valid value
+	$per_page = ($per_page <= 0) ? 1 : $per_page;
+
+	$seperator = '<li>&nbsp;</li>';
+	$total_pages = ceil($num_items / $per_page);
+
+	if ($total_pages == 1 || !$num_items)
+	{
+		return false;
+	}
+
+	$on_page = floor($start_item / $per_page) + 1;
+	$url_delim = (strpos($base_url, '?') === false) ? '?' : '&amp;';
+
+	$page_string = ($on_page == 1) ? '<ul><li class="active"><span>1</span></li>' : '<ul><li><a href="' . $base_url . $anker .'">1</a></li>';
+
+	if ($total_pages > 5)
+	{
+		$start_cnt = min(max(1, $on_page - 4), $total_pages - 5);
+		$end_cnt = max(min($total_pages, $on_page + 4), 6);
+
+		// Add ... separator to pagination
+		$page_string .= ($start_cnt > 1) ? '<li class="ellipsis" role="separator"><span>' . $user->lang['ELLIPSIS'] . '</span></li>' : $seperator;
+
+		for ($i = $start_cnt + 1; $i < $end_cnt; ++$i)
+		{
+			$page_string .= ($i == $on_page) ? '<li class="active"><span>' . $i . '</span></li>' : '<li><a href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . (($i - 1) * $per_page) . $anker . '">' . $i . '</a></li>';
+			if ($i < $end_cnt - 1)
+			{
+				$page_string .= $seperator;
+			}
+		}
+
+		// Add ... separator to pagination
+		$page_string .= ($end_cnt < $total_pages) ? '<li class="ellipsis" role="separator"><span>' . $user->lang['ELLIPSIS'] . '</span></li>' : $seperator;
+	}
+	else
+	{
+		$page_string .= $seperator;
+
+		for ($i = 2; $i < $total_pages; ++$i)
+		{
+			$page_string .= ($i == $on_page) ? '<li class="active"><span>' . $i . '</span></li>' : '<li><a href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . (($i - 1) * $per_page) . $anker . '">' . $i . '</a></li>';
+			if ($i < $total_pages)
+			{
+				$page_string .= $seperator;
+			}
+		}
+	}
+	$page_string .= ($on_page == $total_pages) ? '<li class="active"><span>' . $total_pages . '</span></li></ul>' : '<li><a href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . (($total_pages - 1) * $per_page) . $anker . '">' . $total_pages . '</a></li></ul>';
+
+	if ($add_prevnext_text)
+	{
+		if ($on_page != 1)
+		{
+			$page_string = '<a href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . (($on_page - 2) * $per_page) . $anker . '">' . $user->lang['PREVIOUS'] . '</a>&nbsp;&nbsp;' . $page_string;
+		}
+
+		if ($on_page != $total_pages)
+		{
+			$page_string .= '&nbsp;&nbsp;<a href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . ($on_page * $per_page) . $anker . '">' . $user->lang['NEXT'] . '</a>';
+		}
+	}
+
+	$template->assign_vars(array(
+		$tpl_prefix . 'BASE_URL'      => $base_url,
+		'A_' . $tpl_prefix . 'BASE_URL'   => is_string($base_url) ? $base_url : '',
+		$tpl_prefix . 'PER_PAGE'      => $per_page,
+
+		$tpl_prefix . 'PREVIOUS_PAGE'   => ($on_page == 1) ? '' : $base_url . "{$url_delim}" . $pagination_type . '=' . (($on_page - 2) * $per_page) . $anker,
+		$tpl_prefix . 'NEXT_PAGE'      => ($on_page == $total_pages) ? '' : $base_url . "{$url_delim}" . $pagination_type . '=' . ($on_page * $per_page) . $anker,
+		$tpl_prefix . 'TOTAL_PAGES'      => $total_pages,
+	));
+
+	return $page_string;
+}
+
+/**
+* Check if table exists
+* @copyright (c) 2007 phpBB Group
+*
+* @param string	$table_name	The table name to check for
+* @return bool true if table exists, else false
+*/
+function sql_table_exists($table_name)
+{
+	global $db;
+	$db->sql_return_on_error(true);
+	$result = $db->sql_query_limit('SELECT * FROM ' . $db->sql_escape($table_name), 1);
+	$db->sql_return_on_error(false);
+
+	if ($result)
+	{
+		$db->sql_freeresult($result);
+		return true;
+	}
+
+	return false;
+}
+
+/**
+* get topic tracking info for news
+* based on get_complete_tracking_info of phpBB3
+* this should reduce the queries for the news and announcements block
+*/
+function get_portal_tracking_info($fetch_news)
+{
+	global $config, $request, $user;
+
+	$last_read = $topic_ids = $forum_ids = $tracking_info = $rev_forum_ids = $user_lastmark = array();
+
+	/**
+	* group everything by the forum IDs
+	*/
+	$count = $fetch_news['topic_count'];
+	for ($i = 0; $i < $count; ++$i)
+	{
+		$tracking_info[$fetch_news[$i]['forum_id']][] = $fetch_news[$i]['topic_id'];
+		$topic_ids[] = $fetch_news[$i]['topic_id'];
+		$forum_ids[] = $fetch_news[$i]['forum_id'];
+		$rev_forum_ids[$fetch_news[$i]['topic_id']] = $fetch_news[$i]['forum_id']; // the other way round also helps
+	}
+
+	foreach ($tracking_info as $forum_id => $current_forum)
+	{
+		if ($config['load_db_lastread'] && $user->data['is_registered'])
+		{
+			global $db;
+
+			$mark_time = array();
+
+			$sql = 'SELECT topic_id, mark_time
+				FROM ' . TOPICS_TRACK_TABLE . "
+				WHERE user_id = {$user->data['user_id']}
+					AND " . $db->sql_in_set('topic_id', $current_forum);
+			$result = $db->sql_query($sql);
+
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$last_read[$row['topic_id']] = $row['mark_time'];
+			}
+			$db->sql_freeresult($result);
+
+			$current_forum = array_diff($current_forum, array_keys($last_read));
+
+			if (sizeof($topic_ids))
+			{
+				$sql = 'SELECT forum_id, mark_time
+					FROM ' . FORUMS_TRACK_TABLE . "
+					WHERE user_id = {$user->data['user_id']}
+						AND " . $db->sql_in_set('forum_id', $forum_ids);
+				$result = $db->sql_query($sql);
+
+				while ($row = $db->sql_fetchrow($result))
+				{
+					$mark_time[$row['forum_id']] = $row['mark_time'];
+				}
+				$db->sql_freeresult($result);
+
+				// @todo: do not use $current_forum here as this is already used by the outside foreach
+				foreach($forum_ids as $current_forum)
+				{
+					$user_lastmark[$current_forum] = (isset($mark_time[$current_forum])) ? $mark_time[$current_forum] : $user->data['user_lastmark'];
+				}
+
+				// @todo: also check if $user_lastmark has been defined for this specific forum_id
+				foreach ($topic_ids as $topic_id)
+				{
+					if (!isset($last_read[$topic_id]) || (isset($user_lastmark[$rev_forum_ids[$topic_id]]) && $user_lastmark[$rev_forum_ids[$topic_id]] > $last_read[$topic_id]))
+					{
+						$last_read[$topic_id] =  $user_lastmark[$rev_forum_ids[$topic_id]];
+					}
+				}
+			}
+		}
+		else if ($config['load_anon_lastread'] || $user->data['is_registered'])
+		{
+			global $tracking_topics;
+
+			if (!isset($tracking_topics) || !sizeof($tracking_topics))
+			{
+				if ($request->is_set($config['cookie_name'] . '_track', \phpbb\request\request_interface::COOKIE))
+				{
+					$tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, \phpbb\request\request_interface::COOKIE);
+				}
+				else
+				{
+					$tracking_topics = '';
+				}
+				$tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array();
+			}
+
+			if (!$user->data['is_registered'])
+			{
+				$user_lastmark = (isset($tracking_topics['l'])) ? base_convert($tracking_topics['l'], 36, 10) + $config['board_startdate'] : 0;
+			}
+			else
+			{
+				$user_lastmark = $user->data['user_lastmark'];
+			}
+
+			foreach ($topic_ids as $topic_id)
+			{
+				$topic_id36 = base_convert($topic_id, 10, 36);
+
+				if (isset($tracking_topics['t'][$topic_id36]))
+				{
+					$last_read[$topic_id] = base_convert($tracking_topics['t'][$topic_id36], 36, 10) + $config['board_startdate'];
+				}
+			}
+
+			$topic_ids = array_diff($topic_ids, array_keys($last_read));
+
+			if (sizeof($topic_ids))
+			{
+				$mark_time = array();
+
+				if (isset($tracking_topics['f'][$forum_id]))
+				{
+					$mark_time[$forum_id] = base_convert($tracking_topics['f'][$forum_id], 36, 10) + $config['board_startdate'];
+				}
+
+				$user_lastmark = (isset($mark_time[$forum_id])) ? $mark_time[$forum_id] : $user_lastmark;
+
+				foreach ($topic_ids as $topic_id)
+				{
+					$last_read[$topic_id] = $user_lastmark;
+				}
+			}
+		}
+	}
+
+	return $last_read;
+}
+
+/**
+* Check if the entered source file actually exists
+*
+* @param string	$value		Filename of file to check
+* @param string	$key		Key of the acp setting (unused here)
+* @param int	$module_id	Module ID of this module
+* @param bool	$force_error	Whether an error message should be triggered on
+*				errors.
+* @return bool|string False if file exists, an error string if file doesn't exist.
+*/
+function check_file_src($value, $key, $module_id, $force_error = true)
+{
+	global $db, $phpbb_root_path, $phpEx, $user;
+
+	$error = '';
+
+	// We check if the chosen file is present in all active styles
+	$sql = 'SELECT style_path
+			FROM ' . STYLES_TABLE . '
+			WHERE style_active = 1';
+
+	$result = $db->sql_query($sql);
+	while ($row = $db->sql_fetchrow($result))
+	{
+		if (!file_exists($phpbb_root_path . 'styles/' . $row['style_path'] . '/theme/images/portal/' . $value) &&
+			!file_exists($phpbb_root_path . 'ext/board3/portal/styles/' . $row['style_path'] . '/theme/images/portal/' . $value))
+		{
+			$error .= $user->lang['B3P_FILE_NOT_FOUND'] . ': styles/' . $row['style_path'] . '/theme/images/portal/' . $value . '<br />';
+		}
+	}
+	$db->sql_freeresult($result);
+
+	if (!empty($error))
+	{
+		if ($force_error)
+		{
+			trigger_error($error . adm_back_link(append_sid("{$phpbb_root_path}adm/index.$phpEx", 'i=\board3\portal\acp\portal_module&amp;mode=config&amp;module_id=' . $module_id)), E_USER_WARNING);
+		}
+		else
+		{
+			return $error;
+		}
+	}
+	else
+	{
+		return false;
+	}
+}
+
+/**
+* Get the groups a user is in
+*
+* @return array Array containing the user's groups
+*/
+function get_user_groups()
+{
+	global $cache, $db, $user;
+
+	$groups_ary = $cache->get('_user_groups_' . $user->data['user_id']);
+
+	if ($groups_ary === false)
+	{
+		// get user's groups
+		$sql = 'SELECT group_id
+				FROM ' . USER_GROUP_TABLE . '
+				WHERE user_id = ' . (int) $user->data['user_id'] . '
+				ORDER BY group_id ASC';
+		$result = $db->sql_query($sql);
+		while($row = $db->sql_fetchrow($result))
+		{
+			$groups_ary[] = $row['group_id'];
+		}
+		$db->sql_freeresult($result);
+
+		// save data in cache for 60 seconds
+		$cache->put('_user_groups_' . $user->data['user_id'], $groups_ary, 60);
+	}
+
+	return $groups_ary;
+}

includes/functions_modules.php

@@ -1,17 +1,12 @@
 <?php
 /**
 *
-* @package Board3 Portal v2
+* @package Board3 Portal v2.1
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 function column_num_string($column)
 {
 	switch ($column)
@@ -26,8 +21,8 @@ function column_num_string($column)
 			return 'top';
 		case 5:
 			return 'bottom';
-        default:
+		default:
-            return 0;
+			return 0;
 	}
 }
 

includes/functions_upload.php

@@ -1,16 +1,13 @@
 <?php
 /**
 *
-* @package Board3 Portal v2
+* @package Board3 Portal v2.1
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-if (!defined('IN_PHPBB'))
+namespace board3\portal\includes;
-{
-   exit;
-}
 
 /**
 * @ignore
@@ -105,7 +102,7 @@ class portal_upload
 
 					// Now we need to get the files inside the folders
 					//$folder_contents = $this->cut_folder(scandir($mod_dir));
-					$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($mod_dir)); // requires PHP 5
+					$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($mod_dir, FilesystemIterator::SKIP_DOTS)); // requires PHP 5
 
 					foreach($iterator as $cur_file)
 					{
@@ -114,16 +111,6 @@ class portal_upload
 						$cur_path = str_replace($mod_dir . '/', '', $cur_path);
 						$cut_pos = strpos($cur_path, '/');
 
-						/* 
-						* We only copy files. The recursive iterator might grab paths depending on
-						* the PHP version. This will trigger our error handle with trigger_error()
-						* though. If we are trying to copy a directory just move on.
-						*/
-						if (is_dir($cur_path))
-						{
-							continue;
-						}
-
 						// Only allow files in adm, language, portal and styles folder and a license.txt
 						if(!in_array(substr($cur_path, 0, $cut_pos), array('adm', 'language', 'portal', 'styles')) && $cur_file->getFilename() != 'license.txt')
 						{
@@ -139,7 +126,7 @@ class portal_upload
 
 					if (!sizeof($file->error))
 					{
-						// Let's start moving our files where they belong						
+						// Let's start moving our files where they belong
 						foreach ($actions['NEW_FILES'] as $source => $target)
 						{
 							/*
@@ -255,7 +242,7 @@ class portal_upload
 		}
 
 		foreach (scandir($dir) as $item)
-		{ 
+		{
 			if ($item == '.' || $item == '..')
 			{
 				continue;
@@ -279,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 
@@ -332,7 +319,7 @@ class portal_upload
 
 	/**
 	* @author Michal Nazarewicz (from the php manual)
-	* Creates all non-existant directories in a path
+	* Creates all non-existent directories in a path
 	* @param $path - path to create
 	* @param $mode - CHMOD the new dir to these permissions
 	* @return bool

includes/helper.php

@@ -0,0 +1,79 @@
+<?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\includes;
+
+class helper
+{
+	/**
+	* Board3 Modules service collection
+	* @var \phpbb\di\service_collection
+	*/
+	protected $modules;
+
+	/**
+	* Constructor
+	* NOTE: The parameters of this method must match in order and type with
+	* the dependencies defined in the services.yml file for this service.
+	* @param \phpbb\di\service_collection $modules Board3 Modules service
+	*						collection
+	*/
+	public function __construct($modules)
+	{
+		$this->register_modules($modules);
+	}
+
+	/**
+	* Register list of Board3 Portal modules
+	*
+	* @param \phpbb\di\service_collection $modules Board3 Modules service
+	*						collection
+	* @return null
+	*/
+	protected function register_modules($modules)
+	{
+		foreach ($modules as $current_module)
+		{
+			$class_name = '\\' . get_class($current_module);
+			if (!isset($this->modules[$class_name]))
+			{
+				$this->modules[$class_name] = $current_module;
+			}
+		}
+	}
+
+	/**
+	* Get module specified by module class name
+	*
+	* @param string $module_name Module class name
+	*
+	* @return bool|object The module object if it exists, false if not
+	*/
+	public function get_module($module_name)
+	{
+		if (isset($this->modules[$module_name]))
+		{
+			return $this->modules[$module_name];
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	* Get all supported modules
+	*
+	* @return array An array containing all supported modules
+	*/
+	public function get_all_modules()
+	{
+		return $this->modules;
+	}
+}

includes/modules_helper.php

@@ -0,0 +1,138 @@
+<?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\includes;
+
+class modules_helper
+{
+	/**
+	* Auth object
+	* @var \phpbb\auth\auth
+	*/
+	protected $auth;
+
+	/**
+	* phpBB config
+	* @var \phpbb\config\config
+	*/
+	protected $config;
+
+	/**
+	* phpBB request
+	* @var \phpbb\request\request
+	*/
+	protected $request;
+
+	/**
+	* Constructor
+	* NOTE: The parameters of this method must match in order and type with
+	* the dependencies defined in the services.yml file for this service.
+	* @param \phpbb\auth\auth $auth Auth object
+	* @param \phpbb\config\config $config phpBB config
+	* @param \phpbb\request\request $request phpBB request
+	*/
+	public function __construct($auth, $config, $request)
+	{
+		$this->auth = $auth;
+		$this->config = $config;
+		$this->request = $request;
+	}
+
+	/**
+	* Get an array of disallowed forums
+	*
+	* @param bool $disallow_access Whether the array for disallowing access
+	*			should be filled
+	* @return array Array of forums the user is not allowed to access
+	*/
+	public function get_disallowed_forums($disallow_access)
+	{
+		if ($disallow_access == true)
+		{
+			$disallow_access = array_unique(array_keys($this->auth->acl_getf('!f_read', true)));
+		}
+		else
+		{
+			$disallow_access = array();
+		}
+
+		return $disallow_access;
+	}
+
+	/**
+	* Generate select box
+	*
+	* @param string	$key			Key of select box
+	* @param array	$select_ary		Array of select box options
+	* @param array	$selected_options	Array of selected options
+	*
+	* @return string HTML code of select box
+	* @access public
+	*/
+	public function generate_select_box($key, $select_ary, $selected_options)
+	{
+		// Build options
+		$options = '<select id="' . $key . '" name="' . $key . '[]" multiple="multiple">';
+		foreach ($select_ary as $id => $option)
+		{
+			$options .= '<option value="' . $option['value'] . '"' . ((in_array($option['value'], $selected_options)) ? ' selected="selected"' : '') . (!empty($option['disabled']) ? ' disabled="disabled" class="disabled-option"' : '') . '>' . $option['title'] . '</option>';
+		}
+		$options .= '</select>';
+
+		return $options;
+	}
+
+	/**
+	* Generate forum select box
+	*
+	* @param string $value	Value of select box
+	* @param string $key	Key of select box
+	*
+	* @return string HTML code of select box
+	* @access public
+	*/
+	public function generate_forum_select($value, $key)
+	{
+		$forum_list = make_forum_select(false, false, true, true, true, false, true);
+
+		$selected_options = $select_ary = array();
+		if(isset($this->config[$key]) && strlen($this->config[$key]) > 0)
+		{
+			$selected_options = explode(',', $this->config[$key]);
+		}
+
+		// Build forum options
+		foreach ($forum_list as $f_id => $f_row)
+		{
+			$select_ary[] = array(
+				'value'		=> $f_id,
+				'title'		=> $f_row['padding'] . $f_row['forum_name'],
+				'disabled'	=> $f_row['disabled'],
+			);
+		}
+
+		return $this->generate_select_box($key, $select_ary, $selected_options);
+	}
+
+	/**
+	* Store selected forums
+	*
+	* @param string $key Key name
+	*
+	* @return null
+	* @access public
+	*/
+	public function store_selected_forums($key)
+	{
+		// Get selected extensions
+		$values = $this->request->variable($key, array(0 => ''));
+		$news = implode(',', $values);
+		$this->config->set($key, $news);
+	}
+}

includes/version_check.php

@@ -0,0 +1,110 @@
+<?php
+/**
+*
+* @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
+*
+*/
+
+namespace board3\portal\includes;
+
+class version_check
+{
+	/**
+	* @var array version_data
+	*/
+	protected $version_data;
+
+	/**
+	* @var \phpbb\config\config
+	*/
+	protected $config;
+
+	/**
+	* @var \phpbb\version_helper $version_helper phpBB version helper
+	*/
+	protected $version_helper;
+
+	/**
+	* @var \phpbb\template\twig\twig
+	*/
+	protected $template;
+
+	/**
+	* @var \phpbb\user
+	*/
+	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 \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, $version_helper, $template, $user)
+	{
+		$this->version_data = $version_data;
+		$this->config = $config;
+		$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 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)
+	{
+		// 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);
+
+		$this->version_helper->force_stability(($this->config['extension_force_unstable'] || !$this->version_helper->is_stable($this->current_version)) ? 'unstable' : null);
+
+		$updates = $this->version_helper->get_suggested_updates(true);
+
+		// Return version if $return_version is set to true
+		if ($return_version)
+		{
+			return $this->current_version;
+		}
+
+		$version_up_to_date = empty($updates);
+
+		$template_data = array(
+			'AUTHOR'			=> $this->version_data['author'],
+			'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'],
+			'TITLE'				=> (string) $this->version_data['title'],
+			'LATEST_VERSION'	=> $this->current_version,
+		);
+
+		if (!$version_up_to_date)
+		{
+			$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);
+	}
+}

install.xml

@@ -1,462 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<?xml-stylesheet type="text/xsl" href="modx.prosilver.en.xsl"?>
-<!--For security purposes, please check: http://www.phpbb.com/mods/ for the latest version of this MOD. Although MODs are checked before being allowed in the MODs Database there is no guarantee that there are no security problems within the MOD. No support will be given for MODs not found within the MODs Database which can be found at http://www.phpbb.com/mods/-->
-<mod xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://www.phpbb.com/mods/xml/modx-1.2.6.xsd">
-	<header>
-		<license>http://opensource.org/licenses/gpl-license.php GNU General Public License v2</license>
-
-		<title lang="en">board3 Portal</title>
-		<title lang="de">board3 Portal</title>
-
-		<description lang="en">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.
-
-Included language files:
-» English (en)
-» German (de)
-
-More languages can be found in our International forum: http://www.board3.de/viewforum.php?f=13</description>
-		<description lang="de">Fügt ein Portal mit diversen Boxen deinem Forum hinzu.
-Im Admin-Bereich kann man unter Anderem die Einstellungen ändern, die Blöcke verschieben, neue Blöcke hinzufügen und vieles mehr.
-
-Enthaltenen Sprachdateien:
-» Englisch (en)
-» Deutsch (de)
-
-Weitere Sprachen kannst in unserem Internationalen Forum finden: http://www.board3.de/viewforum.php?f=13
-</description>
-
-		<author-notes lang="en">This MOD requires PHP5. I hope you get everything working. Further developement, new boxes for the portal or questions are welcome at www.board3.de
-		</author-notes>
-		<author-notes lang="de">Dieser MOD benötigt PHP5. Ich hoffe ihr habt Spaß am Portal. Neuen Code, bzw neue Boxen und Fragen könnt ihr auf www.board3.de posten.
-		</author-notes>
-		<github>https://github.com/board3/Board3-Portal</github>
-		<author-group>
-			<author>
-				<realname>Marc Alexander</realname>
-				<username>Marc</username>
-				<email>admin@m-a-styles.de</email>
-				<homepage>http://www.m-a-styles.de</homepage>
-				<contributions-group>
-					<contributions status="current" position="Main-Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Joas Schilling</realname>
-				<email>nickvergessen@gmx.de</email>
-				<username>nickvergessen</username>
-				<homepage>http://mods.flying-bits.org/</homepage>
-				<contributions-group>
-					<contributions status="current" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Kevin</realname>
-				<username>saint_hh</username>
-				<homepage>http://www.board3.de</homepage>
-				<contributions-group>
-					<contributions status="current" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Ice</realname>
-				<username>avaren</username>
-				<homepage>http://www.board3.de</homepage>
-				<contributions-group>
-					<contributions status="past" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Christian</realname>
-				<username>Christian_N</username>
-				<homepage>http://www.phpbb-projekt.de</homepage>
-				<contributions-group>
-					<contributions status="past" position="Developer"></contributions>
-				</contributions-group>
-			</author>
-			<author>
-				<realname>Walter</realname>
-				<email>w.bobeth@digitalfotografie-foren.de</email>
-				<username>Redbull254</username>
-				<homepage>http://www.digitalfotografie-foren.de</homepage>
-				<contributions-group>
-					<contributions status="past" position="Developer"></contributions>
-				</contributions-group>
-			 </author>
-		</author-group>
-
-		<mod-version>2.0.2</mod-version>
-
-		<installation>
-			<level>easy</level>
-			<time>600</time>
-			<target-version>3.0.12</target-version>
-		</installation>
-
-		<link-group>
-			<link type="dependency" lang="en" href="http://www.phpbb.com/community/viewtopic.php?f=69&amp;t=691155">Board3 Portal supports MOD Version Check. To use this feature, this mod has to be installed.</link>
-			<link type="dependency" lang="de" href="http://www.phpbb.com/community/viewtopic.php?f=69&amp;t=691155">Board3 Portal unterstützt MOD Version Check. Um dieses Feature zu nutzen, muss dieser Mod installiert sein.</link>
-			<link type="language" lang="en" href="contrib/de.xml">Manual for German Language-set</link>
-			<link type="language" lang="de" href="contrib/de.xml">Anleitung für das deutsche Sprachpaket</link>
-			<link type="template" lang="en" href="contrib/subsilver2.xml">Manual for subsilver2</link>
-			<link type="template" lang="de" href="contrib/subsilver2.xml">Anleitung für subsilver2</link>
-			<link type="contrib" lang="en" href="contrib/update_201_to_202/update.xml">Manual for Updating B3P 2.0.1 to 2.0.2</link>
-			<link type="contrib" lang="de" href="contrib/update_201_to_202/update.xml">Anleitung für das Aktualisieren von B3P 2.0.1 zu 2.0.2</link>
-		</link-group>
-		<history>
-			<entry>
-				<date>2013-10-27</date>
-				<rev-version>2.0.2</rev-version>
-				<changelog lang="en">
-					<change>[ticket/216] Add function for obtaining user's groups</change>
-					<change>[ticket/217] Handle incorrect values in the news URL</change>
-					<change>[cleanup/acp] Make acp_portal module more readable</change>
-					<change>[cleanup/tabs] Remove unnecessary tabbing in portal files</change>
-					<change>[cleanup/whitespace] Get rid of unnecessary whitespace</change>
-					<change>Display correct day of the week with negative UTC offset</change>
-					<change>[ticket/120] Move birthday block HTML to template files</change>
-					<change>[ticket/224] Add possibility to append username to donation</change>
-					<change>[ŧicket/223] Set correct permissions to uploaded files (644)</change>
-					<change>[feature/clean-up] Remove duplicated code from portal modules</change>
-					<change>[gh/113] Update UMIL to 1.0.5</change>
-					<change>Slight changes to design of portal</change>
-				</changelog>
-				<changelog lang="de">
-					<change>[ticket/216] Füge Funktion zur Erlangung der Gruppen eines Benutzers hinzu</change>
-					<change>[ticket/217] Behandele falsche Parameter in der News URL</change>
-					<change>[cleanup/acp] Mache acp_portal lesbarer</change>
-					<change>[cleanup/tabs] Entferne sinnlose Tabs in Portal Dateien</change>
-					<change>[cleanup/whitespace] Entferne unnötige Leerzeichen</change>
-					<change>Zeige korrekten Tag der Woche bei negativem UTC Abstand an</change>
-					<change>[ticket/120] Verschiebe HTML des Geburtstags-Blocks in Template Dateien</change>
-					<change>[ticket/224] Füge Möglichkeit des Anhängens des Benutzernamens an Spende ein</change>
-					<change>[ŧicket/223] Setze richtige Berechtigungen für hochgeladene Dateien (644)</change>
-					<change>[feature/clean-up] Entferne doppelten Code von Portal Modulen</change>
-					<change>[gh/113] Aktualisiere UMIL zu 1.0.5</change>
-					<change>Kleine Änderungen im Design des Portals</change>
-				</changelog>
-			</entry>
-			<entry>
-				<date>2012-10-13</date>
-				<rev-version>2.0.1</rev-version>
-				<changelog lang="en">
-					<change>Redirect to portal.php when detecting incorrect announcement parameter</change>
-					<change>Add rel="nofollow" to calendar navigation</change>
-					<change>Fixed incorrect handling of months by strtotime</change>
-					<change>Fix previous commit for calendar</change>
-					<change>Fix incorrect config_name in portal_recent.php</change>
-					<change>Fix error if server-side topic marking is disabled</change>
-					<change>Fix incorrect space between blocks in IE9</change>
-					<change>[ticket/203] Future all day events are always displayed as current</change>
-					<change>[ticket/207] Debug warning in ACP when using PHP 5.4</change>
-					<change>[ticket/206] Missing link to MCP in subsilver2</change>
-					<change>Fix PHP notice when unable to rename</change>
-					<change>Fix incorrect space above calendar in IE9</change>
-					<change>Properly handle mutated vowels in links</change>
-					<change>Enable stylechanger for guests again</change>
-					<change>Add missing language var for logs after removing a link</change>
-					<change>Remove converter for Board3 Portal 1.0.6</change>
-					<change>Fix: Infinite loop caused by smiley code with "["</change>
-					<change>Fix: Only variables can be passed by ref in strict mode</change>
-					<change>Display events that start in the next 24 Hours as "Current"</change>
-					<change>Remove unnecessary variables from format_birthday() &amp; clean-up</change>
-					<change>Save module settings even if module image can't be found</change>
-					<change>Add missing error messages to links &amp; main menu modules</change>
-					<change>Remove update instructions for old releases</change>
-					<change>Remove update for beta version</change>
-					<change>Add missing language variable "NO_FILE_B3P"</change>
-				</changelog>
-				<changelog lang="de">
-					<change>Leite bei falschen Parametern für Ankündigungen an die portal.php weiter</change>
-					<change>Füge rel="nofollow" zur Kalender Navigation hinzu</change>
-					<change>Korrigiere fehlerhafte Behandlung von Monaten mit strtotime</change>
-					<change>Korrigiere vohergehende Änderung für den Kalender</change>
-					<change>Korrigiere falschen config_name in portal_recent.php</change>
-					<change>Korrigiere Fehler falls serverseitiges Markieren von Themen deaktiviert ist</change>
-					<change>Korrigiere falschen Abstand zwischen Blöcken in IE9</change>
-					<change>[ticket/203] Future all day events are always displayed as current</change>
-					<change>[ticket/207] PHP 5.4.0 Unterstützung / Support</change>
-					<change>[ticket/206] Kein Link zum Moderations-Bereich im user_menu_side.html bei subsilver2</change>
-					<change>Korrigiere PHP notice falls nicht umbenannt werden kann</change>
-					<change>Korrigiere falschen Abstand über dem Kalender in IE9</change>
-					<change>Gehe korrekt mit Umlauten in Links um</change>
-					<change>Aktiviere Stylechanger wieder für Gäste</change>
-					<change>Füge fehlende Sprachvariablen für Logs nach dem Entfernen von Links hinzu</change>
-					<change>Entferne Konverter für Board3 Portal 1.0.6</change>
-					<change>Korrigiere Endlosschleife durch Smiley Code mit "["</change>
-					<change>Korrigiere: Only variables can be passed by ref in strict mode</change>
-					<change>Zeige Veranstaltungen die in den nächsten 24 Stunden beginnen als aktuell an</change>
-					<change>Entferne unnötige Variablen von format_birthday() &amp; räume etwas auf</change>
-					<change>Sichere Modul Einstellungen auch wenn die Modul Bilder nicht gefunden werden können</change>
-					<change>Füge fehlende Fehlermeldungen zu Links &amp; Menü Modulen hinzu</change>
-					<change>Entferne Update Anleitungen für ältere Veröffentlichungen</change>
-					<change>Entferne Update Anleitung für Beta Version</change>
-					<change>Füge fehlende Sprachvariable "NO_FILE_B3P" hinzu</change>
-				</changelog>
-			</entry>
-			<entry>
-				<date>2012-04-06</date>
-				<rev-version>2.0.0</rev-version>
-				<changelog lang="en">
-					<change>Replaced German language vars with English ones</change>
-					<change>Fixed 2 small errors in calendar language file</change>
-					<change>Fixed incorrect links to convert instruction</change>
-					<change>Added note to author notes that PHP5 is required</change>
-					<change>Fixed incorrect handling of utf8 characters in custom blocks</change>
-					<change>Fixed missing height and width in module images of custom blocks</change>
-					<change>Modified module title to "Attachments" as suggested by wang555</change>
-					<change>Fixed incorrect timezone handling of events</change>
-					<change>Removed number in latest bots title</change>
-					<change>Centered clock in prosilver</change>
-					<change>Added br-tag in forumlist.html to prevent issues in custom styles</change>
-					<change>Fixed small cosmetic errors in prosilver</change>
-					<change>Added correct padding between headerbar and portal body</change>
-					<change>Hide module image settings in center, top &amp; bottom column</change>
-					<change>Added missing permission check for calendar events</change>
-					<change>Fixed incorrect position of event desc in future events (prosilver)</change>
-					<change>Modified style of calendar in subsilver2</change>
-					<change>Fixed: Jumpbox doesn't care if it is enabled in the ACP</change>
-					<change>Added a few rtl fixes</change>
-					<change>Fixed: Unread topics do not get displayed</change>
-					<change>Add possibility to define a different class for callback functions</change>
-					<change>Moved trim_message tool to includes folder</change>
-					<change>Added missing lang entries for removed events</change>
-					<change>Fixed incorrect ordering of users in leaders module</change>
-					<change>Added htmlspecialchars_decode for message before trimming</change>
-					<change>Allow duplicate inclusion of module if it's in a different column type</change>
-					<change>Fixed incorrect arrow directions when using rtl language (ACP)</change>
-					<change>Disabled poll module for the side columns</change>
-					<change>Merged small whois online block into whois online module</change>
-					<change>Fixed missing module_status in board3_basic_install()</change>
-					<change>Add missing update instructions for 2.0.0b1</change>
-					<change>Fix size of input boxes</change>
-					<change>Add missing class references</change>
-					<change>Fixed "unknown column" issue when installing</change>
-					<change>Fixing incorrect size of module box for oneliners</change>
-					<change>Get rid of magic numbers in portal.php</change>
-					<change>Make sure we don't try to copy folders</change>
-					<change>[Fix] Don't let Bots use styleswitcher </change>
-					<change>Added missing language vars and removed useless ones</change>
-					<change>Purge caches via install file</change>
-					<change>Fixed exceeding of max execution time when using trim message tool</change>
-					<change>Moved duplicate javascript to acp_portal.js</change>
-					<change>Hide modules that can't be added</change>
-				</changelog>
-				<changelog lang="de">
-					<change>Deutsche Sprachvariablen mit englischen ersetzt</change>
-					<change>2 kleine Fehler in Kalender Sprachdatei korrigiert</change>
-					<change>Falsche Links zu Konvertierungsanleitung korrigiert</change>
-					<change>PHP5 Anforderung zu Author notes hinzugefügt</change>
-					<change>Inkorrekte Behandlung von utf8 Zeichen in Eigenen Blöcken korrigiert</change>
-					<change>Fehlende Höhe- und Breiteangaben für Modul Bilder von Eigenen Blöcken korrigiert</change>
-					<change>Inkorrekte Behandlung von Zeitzonen bei Veranstaltungen korrigiert</change>
-					<change>Anzahl im Titel des Letzte Bots Modul entfernt</change>
-					<change>Uhr in prosilver zentriert</change>
-					<change>br-tag zu forumlist.html hinzugefügt um Probleme in anderen Styles zu verhindern</change>
-					<change>Kleine kosmetische Fehler in prosilver korrigiert</change>
-					<change>Abstand zwischen header und portal_body korrigiert</change>
-					<change>Verstecke Modul Bild Einstelungen in der Mitte, Oben &amp; Unten</change>
-					<change>Fehlende Überprüfung von Veranstaltungs-Berechtigungen hinzugefügt</change>
-					<change>Position der Veranstaltungs-Beschreibung in prosilver angepasst</change>
-					<change>Styles des Kalenders in subsilver2 geändert</change>
-					<change>Jumpbox lässt sich jetzt deaktivieren</change>
-					<change>Korrekturen für RTL Sprachen</change>
-					<change>Ungelesene Beiträge Icons werden angezeigt</change>
-					<change>Möglichkeit eine andere Klasse für die callback Funktion zu definieren hinzugefügt</change>
-					<change>trim_message Tool in den includes Ordner verschoben</change>
-					<change>Fehlende Sprachvariablen für gelöschte Veranstaltungen hinzugefügt</change>
-					<change>Falsche Sortierung von Benutzernamen in Team Block korrigiert</change>
-					<change>Anwendung von htmlspecialchars_decode() auf Nachricht vor dem Kürzen hinzugefügt</change>
-					<change>Doppelte Einbindung von Modulen erlaubt, falls sie in einem anderen Spaltentyp hinzugefügt werden</change>
-					<change>Falsche Pfeilrichtungen bei RTL Sprachen korrigiert (Admin-Bereich)</change>
-					<change>Umfrage Modul in den seitlichen Spalten deaktiviert</change>
-					<change>Kleinen "Wer ist online?" Block in das "Wer ist online?" Modul eingefügt</change>
-					<change>Fehlender module_stats in board3_basic_install() korrigiert</change>
-					<change>Fehlende Update-Anleitung für 2.0.0b1 hinzugefügt</change>
-					<change>Größe der Input-Boxen korrigiert</change>
-					<change>Fehlende Globalisierung von Klassen und includes hinzugefügt</change>
-					<change>"unknown column" Fehler beim Installieren korrigiert</change>
-					<change>Falsche Größe der Modul Box bei Einzeilern korrigiert</change>
-					<change>"Magic Numbers" in portal.php entfernt</change>
-					<change>Stelle sicher, dass wir nicht versuchen Ordner zu kopieren</change>
-					<change>Lasse Bots nicht den Styleswicher benutzen</change>
-					<change>Fehlende Sprachvariablen hinzugefügt und Unnötige entfernt</change>
-					<change>Leere Caches mit dem Install-Skript</change>
-					<change>Überschreiten der maximalen Ausführungszeit im trim message Tool korrigiert</change>
-					<change>Doppeltes Javascript in acp_portal.js verschoben</change>
-					<change>Verstecke Module die nicht hinzugefügt werden können</change>
-				</changelog>
-			</entry>
-			<entry>
-				<date>2011-06-08</date>
-				<rev-version>2.0.0b1</rev-version>
-				<changelog lang="en">
-					<change>Added missing IF $S_BLOCK_ICON</change>
-					<change>Fixed select for displaying events </change>
-					<change>Add feature to disable modules without having to remove them</change>
-					<change>Fixed typo in title of Latest Bots block</change>
-					<change>Applied patch for folders with special characters (upload module)</change>
-					<change>Reworked parts of calendar block</change>
-					<change>Fixed missing CSS for li-tags of calendar</change>
-					<change>Added error handling to installation of modules</change>
-					<change>Fixed timezone handling of calendar</change>
-					<change>Fixed incorrect handling of links</change>
-					<change>Fixed mixup with td and tr in subsilver2 calendar block</change>
-					<change>Added missing HTML file for center block of attachments module</change>
-					<change>Fixed missing check for correct column when moving a module left or right</change>
-					<change>Added possibility to add forumlist to top and bottom column</change>
-					<change>Corrected language var for module image as suggested by archivar</change>
-					<change>Moved link constants into module files</change>
-					<change>Remove php closing tag</change>
-					<change>Rewrote basic uploader for module zips</change>
-					<change>Modified class files for PHP5 -- PHP5 is now a requirement</change>
-					<change>Added check to prevent adding a module more than once</change>
-					<change>Added feature to hide portal name on acp configuration page for all modules (was only for latest bots module)</change>
-					<change>Added adm folder to allowed upload folders</change>
-					<change>Replace chmod with phpbb_chmod in uploader where needed</change>
-					<change>Added feature to open external links in a new window</change>
-					<change>Merged nickvergessen's phpbb3-tools-trim-message replacing old get_sub_taged_string function</change>
-					<change>Random members block will not be installed by default</change>
-				</changelog>
-				<changelog lang="de">
-					<change>Fehlendes IF $S_BLOCK_ICON hinzugefügt</change>
-					<change>Auswahl für das Anzeigen von Events repariert</change>
-					<change>Fähigkeit hinzugefügt um Module zu deaktivieren ohne sie zu entfernen</change>
-					<change>Schreibfehler in "Letzte Bots" Block beseitigt</change>
-					<change>Patch für Ordner mit Spezialcharaktern hinzugefügt (Upload Modul)</change>
-					<change>Teile des Kalender Blocks überarbeitet</change>
-					<change>Fehlendes CSS für li-tags des Kalenders hinzugefügt</change>
-					<change>Fehlerbehandlung zu Installation von Modulen hinzugefügt</change>
-					<change>Zeitzonenbehandlung in Kalender korrigiert</change>
-					<change>Falsche Behandlung von Links korrigiert</change>
-					<change>Falsche Benutzung von td und tr im subsilver2 Kalender Block beseitigt</change>
-					<change>Fehlende HTML Datei des Dateianhänge Moduls für die mittlere Spalte hinzugefügt</change>
-					<change>Fehlende Überprüfung auf richtige Spalte beim Verschieben der Module</change>
-					<change>Möglichkeit hinzugefügt die Forenliste in die obere und untere Modulezeile hinzuzufügen</change>
-					<change>Sprachvariable für Modulbild, wie von archivar vorgeschlagen, abgeändert</change>
-					<change>Link Konstanten in Module verschoben</change>
-					<change>Schließenden Tag von PHP Dateien entfernt</change>
-					<change>Hochlade-Module für Modul Zips komplett neu geschrieben</change>
-					<change>Klassen Dateien für PHP5 modifiziert -- PHP5 ist jetzt eine Vorraussetzung</change>
-					<change>Überprüfung hinzugefügt, damit ein Modul nicht mehrmals hinzugefügt werden kann</change>
-					<change>Möglichkeits hinzugefügt den Modultitel auf der Konfigurationsseite im ACP zu verstecken</change>
-					<change>adm Ordner zu erlaubten upload Ordnern hinzugefügt</change>
-					<change>chmod mit phpbb_chmod ersetzt in Upload Modul</change>
-					<change>Möglichkeit externe Links in einem neuen Fenster zu öffnen hinzugefügt</change>
-					<change>nickvergessen's phpbb3-tools-trim-message hinzugefügt - ersetzt die alte Funktion get_sub_taged_string()</change>
-					<change>Zufällige Mitglieder Block wird standardmäßig nicht installiert</change>
-				</changelog>
-			</entry>
-			<entry>
-				<date>2011-03-08</date>
-				<rev-version>2.0.0a1</rev-version>
-				<changelog lang="en">
-					<change>First alpha release</change>
-				</changelog>
-				<changelog lang="de">
-					<change>Erste Alpha-Version</change>
-				</changelog>
-			</entry>
-		</history>
-	</header>
-	<action-group>
-		<copy>
-			<file from="root/portal.php" to="portal.php" />
-			<file from="root/adm/images/*.*" to="adm/images/*.*" />
-			<file from="root/adm/mods/board3_portal_check_version.php" to="adm/mods/board3_portal_check_version.php" />
-			<file from="root/adm/style/*.*" to="adm/style/*.*" />
-			<file from="root/includes/acp/*.*" to="includes/acp/*.*" />
-			<file from="root/includes/trim_message/*.*" to="includes/trim_message/*.*" />
-			<file from="root/install/index.php" to="install/index.php" />
-			<file from="root/language/en/mods/*.*" to="language/en/mods/*.*" />
-			<file from="root/portal/*.*" to="portal/*.*" />
-			<file from="root/styles/prosilver/template/portal/*.*" to="styles/prosilver/template/portal/*.*" />
-			<file from="root/styles/prosilver/theme/portal.css" to="styles/prosilver/theme/portal.css" />
-			<file from="root/styles/prosilver/theme/images/portal/*.*" to="styles/prosilver/theme/images/portal/*.*" />
-			<file from="root/umil/*.*" to="umil/*.*" />
-		</copy>
-
-		<open src=".htaccess">
-			<edit>
-				<find><![CDATA[<Files "common.php">
-Order Allow,Deny
-Deny from All
-</Files>]]></find>
-				<action type="after-add"><![CDATA[DirectoryIndex portal.php index.php index.html index.htm]]></action>
-			</edit>
-		</open>
-		<open src="viewonline.php">
-			<edit>
-				<find><![CDATA[		case 'report':
-			$location = $user->lang['REPORTING_POST'];
-			$location_url = append_sid("{$phpbb_root_path}index.$phpEx");
-		break;]]></find>
-				<action type="after-add"><![CDATA[		case 'portal':
-			$user->add_lang('mods/portal');
-			$location = $user->lang['VIEWING_PORTAL'];
-			$location_url = append_sid("{$phpbb_root_path}portal.$phpEx");
-		break;]]></action>
-			</edit>
-		</open>
-		<open src="includes/functions.php">
-			<edit>
-				<find><![CDATA[// The following assigns all _common_ variables that may be used at any point in a template.]]></find>
-				<action type="before-add"><![CDATA[	$user->add_lang('mods/portal');]]></action>
-			</edit>
-			<edit>
-				<find><![CDATA['U_PRIVATEMSGS'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=inbox'),]]></find>
-				<action type="before-add"><![CDATA[		'U_PORTAL'				=> (isset($config['board3_enable']) && $config['board3_enable'] && $auth->acl_get('u_view_portal')) ? append_sid("{$phpbb_root_path}portal.$phpEx") : '',]]></action>
-			</edit>
-		</open>
-		<open src="includes/session.php">
-			<edit>
-				<find><![CDATA[		if (!empty($_GET['style']) && $auth->acl_get('a_styles') && !defined('ADMIN_START'))]]></find>
-				<action type="replace-with"><![CDATA[		if (!empty($_GET['style']) && !defined('ADMIN_START') && !$this->data['is_bot'])]]></action>
-			</edit>
-		</open>
-		<open src="styles/prosilver/template/overall_header.html">
-			<edit>
-				<find><![CDATA[<div class="navbar">]]></find>
-				<action type="before-add"><![CDATA[<!-- IF not $S_IN_PORTAL or S_DISPLAY_PHPBB_MENU -->]]></action>
-			</edit>
-			<edit>
-				<find><![CDATA[<li class="icon-home"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a> <!-- BEGIN navlinks --> <strong>&#8249;</strong>]]></find>
-				<inline-edit>
-					<inline-find><![CDATA[<li class="icon-home">]]></inline-find>
-					<inline-action type="after-add"><![CDATA[<!-- IF U_PORTAL --><a href="{U_PORTAL}">{L_PORTAL}</a> &#187; <!-- ENDIF -->]]></inline-action>
-				</inline-edit>
-			</edit>
-			<edit>
-				<find><![CDATA[					<li class="icon-logout"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x">{L_LOGIN_LOGOUT}</a></li>
-				<!-- ENDIF -->
-			</ul>
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>]]></find>
-				<action type="after-add"><![CDATA[<!-- ENDIF -->]]></action>
-			</edit>
-		</open>
-		<open src="styles/prosilver/template/overall_footer.html">
-			<edit>
-				<find><![CDATA[<li class="icon-home"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a></li>]]></find>
-				<inline-edit>
-					<inline-find><![CDATA[<li class="icon-home">]]></inline-find>
-					<inline-action type="after-add"><![CDATA[<!-- IF U_PORTAL --><a href="{U_PORTAL}">{L_PORTAL}</a> &#187; <!-- ENDIF -->]]></inline-action>
-				</inline-edit>
-			</edit>
-		</open>
-		<open src="styles/prosilver/theme/stylesheet.css">
-			<edit>
-				<find><![CDATA[@import url("colours.css");]]></find>
-				<action type="after-add"><![CDATA[@import url("portal.css");]]></action>
-			</edit>
-		</open>
-		<php-installer>install/index.php</php-installer>
-		<diy-instructions lang="de"><![CDATA[Rufe install/index.php auf und führe den Installer aus.
-
-Lösche anschließend das Installationsverzeichnis.]]></diy-instructions>
-		<diy-instructions lang="en"><![CDATA[Browse to install/index.php and run the installer.
-
-Remove the install-folder afterwards.]]></diy-instructions>
-	</action-group>
-</mod>

language/de/info_acp_portal.php

@@ -0,0 +1,54 @@
+<?php
+/**
+*
+* @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'		=> 'Portal Module',
+	'ACP_PORTAL'			=> 'Portal',
+	'ACP_PORTAL_GENERAL_INFO'	=> 'Allgemeine Einstellungen',
+	'ACP_PORTAL_UPLOAD'		=> 'Modul hochladen',
+
+	// Logs
+	'LOG_PORTAL_LINK_ADDED'				=> '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Link hinzugefügt: %s ',
+	'LOG_PORTAL_LINK_UPDATED'			=> '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Link geändert: %s ',
+	'LOG_PORTAL_LINK_REMOVED'			=> '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Link gelöscht: %s ',
+	'LOG_PORTAL_EVENT_ADDED'			=> '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Termin eingetragen: %s ',
+	'LOG_PORTAL_EVENT_UPDATED'			=> '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Termin geändert: %s ',
+	'LOG_PORTAL_EVENT_REMOVED'			=> '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Termin gelöscht: %s ',
+	'LOG_PORTAL_CONFIG'					=> '<strong>Portal-Einstellungen geändert</strong><br />&raquo; %s',
+
+	// Adding the permissions
+	'ACL_A_MANAGE_PORTAL'		=> 'Kann Portal-Einstellungen ändern',
+	'ACL_U_VIEW_PORTAL'			=> 'Kann das Portal sehen',
+));

language/de/modules/portal_announcements_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Announcements
+* @package Board3 Portal v2.1 - Announcements
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -70,5 +70,5 @@ $lang = array_merge($lang, array(
 	'PORTAL_ANNOUNCEMENTS_ARCHIVE'				=> 'Das Archivsystem für die Bekanntmachungen aktivieren',
 	'PORTAL_ANNOUNCEMENTS_ARCHIVE_EXP'		=> 'Wenn aktiviert, wird das Archivsystem und ggf. Seitenzahlen angezeigt.',
 	'PORTAL_SHOW_REPLIES_VIEWS'				=> '"Antworten" und "Zugriffe" in Extraspalten',
-	'PORTAL_SHOW_REPLIES_VIEWS_EXP'		=> 'Einstellung für den kompakter Bekanntmachungen-Block-Stil.<br />Wenn aktiviert, wird die Anzahl der Antworten und Zugriffe in gesonderten Spalten angezeigt. Wenn deaktiviert gibt es nur zwei Spalten und die Antworten und Zugriffe werden neben "Forum" angezeigt. Bei Darstellungsproblemen mit z.B. schmalen Styles bitte deaktivieren.', 
+	'PORTAL_SHOW_REPLIES_VIEWS_EXP'		=> 'Einstellung für den kompakter Bekanntmachungen-Block-Stil.<br />Wenn aktiviert, wird die Anzahl der Antworten und Zugriffe in gesonderten Spalten angezeigt. Wenn deaktiviert gibt es nur zwei Spalten und die Antworten und Zugriffe werden neben "Forum" angezeigt. Bei Darstellungsproblemen mit z.B. schmalen Styles bitte deaktivieren.',
 ));

language/de/modules/portal_attachments_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Attachments
+* @package Board3 Portal v2.1 - Attachments
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -50,5 +50,5 @@ $lang = array_merge($lang, array(
 	'PORTAL_ATTACHMENTS_FILETYPE' 						=> 'Dateitypen',
 	'PORTAL_ATTACHMENTS_FILETYPE_EXP' 				=> 'Falls "Dateitypen ausschließen" auf "Ja" steht, wähle die Dateitypen die du ausschließen willst.<br />Falls "Dateitypen ausschließen" auf "Nein" steht, wähle die Dateitypen die du sehen willst.<br />Wähle mehrere Foren aus/ab, indem du beim Klicken die <samp>Strg</samp>-Taste drückst.',
 	'PORTAL_ATTACHMENTS_EXCLUDE'						=> 'Dateitypen ausschließen',
-	'PORTAL_ATTACHMENTS_EXCLUDE_EXP'				=> 'Wähle "Ja" wenn du die ausgewählten Dateitypen vom Dateianhänge-Block ausschließen willst, und "Nein" wenn du nur die ausgewählten Dateitypen im Dateianhänge-Block sehen willst.',	
+	'PORTAL_ATTACHMENTS_EXCLUDE_EXP'				=> 'Wähle "Ja" wenn du die ausgewählten Dateitypen vom Dateianhänge-Block ausschließen willst, und "Nein" wenn du nur die ausgewählten Dateitypen im Dateianhänge-Block sehen willst.',
 ));

language/de/modules/portal_birthday_list_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Birthday List
+* @package Board3 Portal v2.1 - Birthday List
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -40,5 +40,5 @@ $lang = array_merge($lang, array(
 	'ACP_PORTAL_BIRTHDAYS_SETTINGS_EXP'		=> 'Hier kannst du die Einstellungen für den Geburtstage-Block ändern.',
 	'PORTAL_BIRTHDAYS'						=> 'Geburtstage',
 	'PORTAL_BIRTHDAYS_AHEAD'				=> 'Anstehende Geburtstage',
-	'PORTAL_BIRTHDAYS_AHEAD_EXP'			=> 'Zeitraum für die Geburtstagsvorschau (Tage).<br />"0" deaktiviert die Anzeige der bevorstehenden Geburtstage.',	
+	'PORTAL_BIRTHDAYS_AHEAD_EXP'			=> 'Zeitraum für die Geburtstagsvorschau (Tage).<br />"0" deaktiviert die Anzeige der bevorstehenden Geburtstage.',
 ));

language/de/modules/portal_calendar_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Calendar
+* @package Board3 Portal v2.1 - Calendar
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -115,14 +115,10 @@ $lang = array_merge($lang, array(
 	'ACP_PORTAL_CALENDAR_START_INCORRECT'	=> 'Die eingegebene Start-Zeit ist nicht korrekt. Bitte folge genau den Anweisungen.',
 	'ACP_PORTAL_CALENDAR_END_INCORRECT'		=> 'Die eingegebene End-Zeit ist nicht korrekt. Bitte folge genau den Anweisungen.',
 	'ACP_PORTAL_CALENDAR_EVENT_PAST'		=> 'Die Start-zeit der Veranstaltung muss in der Zukunft liegen.',
-	'ACP_PORTAL_EVENT_START_DAY'			=> 'Start-Datum der Veranstaltung',
+	'ACP_PORTAL_EVENT_START_DATE'			=> 'Start-Datum der Veranstaltung',
-	'ACP_PORTAL_EVENT_START_DAY_EXP'		=> 'Gebe das Datum ein, an dem die Veranstaltung beginnt. Das Datum muss in folgendem Format sein: TT-MM-JJJJ',
+	'ACP_PORTAL_EVENT_START_DATE_EXP'		=> 'Gebe das Datum und Uhrzeit ein, zu der die Veranstaltung beginnt. Datum und Uhrzeit sollten in einem ähnlichen Format sein: TT.MM.JJJJ SS:MM',
-	'ACP_PORTAL_EVENT_START_TIME'			=> 'Start-Zeit der Veranstaltung',
+	'ACP_PORTAL_EVENT_END_DATE'				=> 'End-Datum der Veranstaltung',
-	'ACP_PORTAL_EVENT_START_TIME_EXP'		=> 'Gebe die Zeit ein, zu der die Veranstaltung beginnt. Die Zeit muss im 24 Stunden Format sein, z.B. 23:12',
+	'ACP_PORTAL_EVENT_END_DATE_EXP'			=> 'Gebe das Datum und Uhrzeit ein, zu der die Veranstaltung endet. Datum und Uhrzeit sollten in einem ähnlichen Format sein: TT.MM.JJJJ',
-	'ACP_PORTAL_EVENT_END_DAY'				=> 'End-Datum der Veranstaltung',
-	'ACP_PORTAL_EVENT_END_DAY_EXP'			=> 'Gebe das Datum ein, an dem die Veranstaltung endet. Das Datum muss in folgendem Format sein: TT-MM-JJJJ',
-	'ACP_PORTAL_EVENT_END_TIME'				=> 'End-Zeit der Veranstaltung',
-	'ACP_PORTAL_EVENT_END_TIME_EXP'			=> 'Gebe die Zeit ein, zu der die Veranstaltung endet. Die Zeit muss im 24 Stunden Forrmat sein, z.B. 23:12',
 	'ACP_PORTAL_CALENDAR_EVENT_START_FIRST'	=> 'Das Ende der Veranstaltung muss nach dem Beginn der Veranstaltung liegen.',
 	'ACP_PORTAL_CALENDAR_PERMISSION'		=> 'Berechtigungen für die Veranstaltung',
 	'ACP_PORTAL_CALENDAR_PERMISSION_EXP'	=> 'Wähle die Gruppen aus, denen es erlaubt sein soll die Veranstaltung zu sehen. Falls alle Benutzer die Veranstaltung sehen sollen, dann wähle nichts aus.<br />Wähle mehrere Gruppen aus/ab, indem du beim Klicken die <samp>Strg</samp>-Taste drückst.',

language/de/modules/portal_clock_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Clock
+* @package Board3 Portal v2.1 - Clock
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/de/modules/portal_custom_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Custom
+* @package Board3 Portal v2.1 - Custom
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/de/modules/portal_donation_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Donation
+* @package Board3 Portal v2.1 - Donation
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/de/modules/portal_forumlist_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Forumlist
+* @package Board3 Portal v2.1 - Forumlist
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/de/modules/portal_friends_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Friends
+* @package Board3 Portal v2.1 - Friends
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/de/modules/portal_latest_bots_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Latest Bots
+* @package Board3 Portal v2.1 - Latest Bots
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/de/modules/portal_latest_members_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Latest Members
+* @package Board3 Portal v2.1 - Latest Members
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/de/modules/portal_leaders_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Leaders
+* @package Board3 Portal v2.1 - Leaders
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/de/modules/portal_link_us_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Link Us
+* @package Board3 Portal v2.1 - Link Us
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/de/modules/portal_links_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Links
+* @package Board3 Portal v2.1 - Links
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -33,7 +33,7 @@ if (empty($lang) || !is_array($lang))
 // 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'	=> 'Keine Links vorhanden', 
+	'LINKS_NO_LINKS'	=> 'Keine Links vorhanden',
 
 	// ACP
 	'ACP_PORTAL_LINKS'				=> 'Links-Einstellungen',

language/de/modules/portal_main_menu_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Main Menu
+* @package Board3 Portal v2.1 - Main Menu
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/de/modules/portal_news_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - News
+* @package Board3 Portal v2.1 - News
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -66,5 +66,5 @@ $lang = array_merge($lang, array(
 	'PORTAL_NEWS_ARCHIVE'					=> 'Das Archivsystem für die aktuellen Beiträge aktivieren',
 	'PORTAL_NEWS_ARCHIVE_EXP'				=> 'Wenn aktiviert, wird das Archivsystem und ggf. Seitenzahlen angezeigt.',
 	'PORTAL_SHOW_REPLIES_VIEWS'				=> '"Antworten" und "Zugriffe" in Extraspalten',
-	'PORTAL_SHOW_REPLIES_VIEWS_EXP'			=> 'Einstellung für den kompakter Bekanntmachungen-Block-Stil.<br />Wenn aktiviert, wird die Anzahl der Antworten und Zugriffe in gesonderten Spalten angezeigt. Wenn deaktiviert gibt es nur zwei Spalten und die Antworten und Zugriffe werden neben "Forum" angezeigt. Bei Darstellungsproblemen mit z.B. schmalen Styles bitte deaktivieren.', 
+	'PORTAL_SHOW_REPLIES_VIEWS_EXP'			=> 'Einstellung für den kompakter Bekanntmachungen-Block-Stil.<br />Wenn aktiviert, wird die Anzahl der Antworten und Zugriffe in gesonderten Spalten angezeigt. Wenn deaktiviert gibt es nur zwei Spalten und die Antworten und Zugriffe werden neben "Forum" angezeigt. Bei Darstellungsproblemen mit z.B. schmalen Styles bitte deaktivieren.',
 ));

language/de/modules/portal_poll_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Poll
+* @package Board3 Portal v2.1 - Poll
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/de/modules/portal_random_member_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Random Member
+* @package Board3 Portal v2.1 - Random Member
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/de/modules/portal_recent_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Recent Module
+* @package Board3 Portal v2.1 - Recent Module
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/de/modules/portal_search_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Search
+* @package Board3 Portal v2.1 - Search
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/de/modules/portal_statistics_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Statistics
+* @package Board3 Portal v2.1 - Statistics
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/de/modules/portal_stylechanger_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Stylechanger
+* @package Board3 Portal v2.1 - Stylechanger
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/de/modules/portal_topposters_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Topposters
+* @package Board3 Portal v2.1 - Topposters
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/de/modules/portal_user_menu_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - User Menu
+* @package Board3 Portal v2.1 - User Menu
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/de/modules/portal_welcome_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Welcome
+* @package Board3 Portal v2.1 - Welcome
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/de/modules/portal_whois_online_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Who is online
+* @package Board3 Portal v2.1 - Who is online
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/de/portal.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2
+* @package Board3 Portal v2.1
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/de/portal_acp.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2
+* @package Board3 Portal v2.1
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2014 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -35,7 +35,6 @@ if (empty($lang) || !is_array($lang))
 
 $lang = array_merge($lang, array(
 	// Portal Module
-	'ACP_PORTAL_MODULES'			=> 'Portal Module',
 	'ACP_PORTAL_MODULES_EXP'		=> 'Du kannst deine Portal Module hier verwalten. Falls du alle Module deaktivierst, dann deaktiviere bitte auch das Portal.',
 
 	'MODULE_POS_TOP'				=> 'Oben',
@@ -75,10 +74,9 @@ $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'							=> 'Portal',
-	'ACP_PORTAL_GENERAL_INFO'				=> 'Allgemeine Einstellungen',
 	'ACP_PORTAL_CONFIG_INFO'				=> 'Allgemeine Einstellungen',
 	'ACP_PORTAL_GENERAL_TITLE'				=> 'Portal Verwaltung',
 	'ACP_PORTAL_GENERAL_TITLE_EXP'			=> 'Danke, dass du dich für board3 Portal entschieden hast. Auf dieser Seite kannst du dein Portal verwalten. Diese Anzeige gibt dir einen schnellen Überblick über die verschiedenen Portal-Einstellungen.',
@@ -94,22 +92,13 @@ $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.',
 
 	'LINK_ADDED'							=> 'Der Link wurde erfolgreich eingetragen',
 	'LINK_UPDATED'							=> 'Der Link wurde erfolgreich geändert',
-	'LOG_PORTAL_LINK_ADDED'					=> '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Link hinzu gefügt: %s ',
-	'LOG_PORTAL_LINK_UPDATED'				=> '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Link geändert: %s ',
-	'LOG_PORTAL_LINK_REMOVED'				=> '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Link gelöscht: %s ',
-	'LOG_PORTAL_EVENT_ADDED'				=> '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Termin eingetragen: %s ',
-	'LOG_PORTAL_EVENT_UPDATED'				=> '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Termin geändert: %s ',
-	'LOG_PORTAL_EVENT_REMOVED'				=> '<strong>Portal-Einstellungen geändert</strong><br />&raquo; Termin gelöscht: %s ',
 
 	// Upload Module
-	'ACP_PORTAL_UPLOAD'				=> 'Modul hochladen',
 	'MODULE_UPLOAD'					=> 'Lade ein Modul hoch',
 	'MODULE_UPLOAD_EXP'				=> 'Wähle die ZIP-Datei des Moduls das du hochladen willst:',
 	'MODULE_UPLOAD_GO'				=> 'Hochladen',
@@ -130,9 +119,6 @@ $lang = array_merge($lang, array(
 	'PORTAL_BASIC_INSTALL'			=> 'Füge Basismodule hinzu',
 	'PORTAL_BASIC_UNINSTALL'		=> 'Entferne Module von Datenbank',
 
-	// Logs
-	'LOG_PORTAL_CONFIG'			=> '<strong>Portal-Einstellungen geändert</strong><br />&raquo; %s',
-
 	/**
 	* A copy of Handyman` s MOD version check, to view it on the gallery overview
 	*/
@@ -144,10 +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',
-
-	// Adding the permissions
-	'acl_a_manage_portal'		=> array('lang' => 'Kann Portal-Einstellungen ändern', 'cat' => 'misc'),
-	'acl_u_view_portal'			=> array('lang' => 'Kann das Portal sehen', 'cat' => 'misc'),
-
 ));

language/en/info_acp_portal.php

@@ -0,0 +1,53 @@
+<?php
+/**
+*
+* @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'		=> 'Portal Modules',
+	'ACP_PORTAL'			=> 'Portal',
+	'ACP_PORTAL_GENERAL_INFO'	=> 'General settings',
+	'ACP_PORTAL_UPLOAD'		=> 'Upload module',
+
+	// Portal logs
+	'LOG_PORTAL_LINK_ADDED'				=> '<strong>Altered Portal settings</strong><br />&raquo; Link added: %s ',
+	'LOG_PORTAL_LINK_UPDATED'			=> '<strong>Altered Portal settings</strong><br />&raquo; Link updated: %s ',
+	'LOG_PORTAL_LINK_REMOVED'			=> '<strong>Altered Portal settings</strong><br />&raquo; Link removed: %s ',
+	'LOG_PORTAL_EVENT_ADDED'			=> '<strong>Altered Portal settings</strong><br />&raquo; Event added: %s ',
+	'LOG_PORTAL_EVENT_UPDATED'			=> '<strong>Altered Portal settings</strong><br />&raquo; Event updated: %s ',
+	'LOG_PORTAL_EVENT_REMOVED'			=> '<strong>Altered Portal settings</strong><br />&raquo; Event removed: %s ',
+	'LOG_PORTAL_CONFIG'					=> '<strong>Altered Portal settings</strong><br />&raquo; %s',
+
+	// Adding the permissions
+	'ACL_A_MANAGE_PORTAL'		=> 'Can alter Portal settings',
+	'ACL_U_VIEW_PORTAL'			=> 'Can view the Portal',
+));

language/en/modules/portal_announcements_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Announcements
+* @package Board3 Portal v2.1 - Announcements
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/en/modules/portal_attachments_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Attachments
+* @package Board3 Portal v2.1 - Attachments
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/en/modules/portal_birthday_list_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Birthday List
+* @package Board3 Portal v2.1 - Birthday List
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/en/modules/portal_calendar_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Calendar
+* @package Board3 Portal v2.1 - Calendar
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -115,14 +115,10 @@ $lang = array_merge($lang, array(
 	'ACP_PORTAL_CALENDAR_START_INCORRECT'	=> 'The start time you entered was incorrect. Please follow the instructions carefully.',
 	'ACP_PORTAL_CALENDAR_END_INCORRECT'		=> 'The end time you entered was incorrect. Please follow the instructions carefully.',
 	'ACP_PORTAL_CALENDAR_EVENT_PAST'		=> 'The event start time needs to be in the future.',
-	'ACP_PORTAL_EVENT_START_DAY'			=> 'Event start date',
+	'ACP_PORTAL_EVENT_START_DATE'			=> 'Event start date',
-	'ACP_PORTAL_EVENT_START_DAY_EXP'		=> 'Enter the date when the event starts. The date has to be in this format: DD-MM-YYYY',
+	'ACP_PORTAL_EVENT_START_DATE_EXP'		=> 'Enter the date and time the event starts. The date has to be in a similar format: MM/DD/YYYY 3:00 PM',
-	'ACP_PORTAL_EVENT_START_TIME'			=> 'Event start time',
+	'ACP_PORTAL_EVENT_END_DATE'			=> 'Event end date',
-	'ACP_PORTAL_EVENT_START_TIME_EXP'		=> 'Enter the time when the event starts. The time has to be in a 24 hour format, i.e. 23:12',
+	'ACP_PORTAL_EVENT_END_DATE_EXP'			=> 'Enter the date and time the event ends. The date has to be in a similar format: MM/DD/YYYY 3:00 PM',
-	'ACP_PORTAL_EVENT_END_DAY'				=> 'Event end date',
-	'ACP_PORTAL_EVENT_END_DAY_EXP'			=> 'Enter the date when the event ends. The date has to be in this format: DD-MM-YYYY',
-	'ACP_PORTAL_EVENT_END_TIME'				=> 'Event end time',
-	'ACP_PORTAL_EVENT_END_TIME_EXP'			=> 'Enter the time when the event ends. The time has to be in a 24 hour format, i.e. 23:12',
 	'ACP_PORTAL_CALENDAR_EVENT_START_FIRST'	=> 'The end of the event has to be after the start of the event.',
 	'ACP_PORTAL_CALENDAR_PERMISSION'		=> 'Event permissions',
 	'ACP_PORTAL_CALENDAR_PERMISSION_EXP'	=> 'Select the groups that should be authorized to view the event. If you want all users to be able to view the event, don’t select anything.<br />Select/Deselect multiple groups by holding <samp>CTRL</samp> and clicking.',

language/en/modules/portal_clock_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Clock
+* @package Board3 Portal v2.1 - Clock
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/en/modules/portal_custom_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Custom
+* @package Board3 Portal v2.1 - Custom
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/en/modules/portal_donation_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Donation
+* @package Board3 Portal v2.1 - Donation
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/en/modules/portal_forumlist_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Forumlist
+* @package Board3 Portal v2.1 - Forumlist
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/en/modules/portal_friends_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Friends
+* @package Board3 Portal v2.1 - Friends
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/en/modules/portal_latest_bots_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Latest Bots
+* @package Board3 Portal v2.1 - Latest Bots
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/en/modules/portal_latest_members_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Latest Members
+* @package Board3 Portal v2.1 - Latest Members
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/en/modules/portal_leaders_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Leaders
+* @package Board3 Portal v2.1 - Leaders
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/en/modules/portal_link_us_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Link Us
+* @package Board3 Portal v2.1 - Link Us
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/en/modules/portal_links_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Links
+* @package Board3 Portal v2.1 - Links
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -33,7 +33,7 @@ if (empty($lang) || !is_array($lang))
 // 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'	=> 'No links', 
+	'LINKS_NO_LINKS'	=> 'No links',
 
 	// ACP
 	'ACP_PORTAL_LINKS'				=> 'Link Settings',

language/en/modules/portal_main_menu_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Main Menu
+* @package Board3 Portal v2.1 - Main Menu
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -40,7 +40,7 @@ $lang = array_merge($lang, array(
 	'M_TERMS'	=> 'Terms of use',
 	'M_PRV'		=> 'Privacy policy',
 	'M_SEARCH'	=> 'Search',
-	'MENU_NO_LINKS'	=> 'No links', 
+	'MENU_NO_LINKS'	=> 'No links',
 
 	// ACP
 	'ACP_PORTAL_MENU'				=> 'Menu settings',

language/en/modules/portal_news_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - News
+* @package Board3 Portal v2.1 - News
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/en/modules/portal_poll_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Poll
+* @package Board3 Portal v2.1 - Poll
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/en/modules/portal_random_member_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Random Member
+* @package Board3 Portal v2.1 - Random Member
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

language/en/modules/portal_recent_module.php

@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package Board3 Portal v2 - Recent
+* @package Board3 Portal v2.1 - Recent
-* @copyright (c) Board3 Group ( www.board3.de )
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */