Changes for phpbb 3.3.0

[ticket/704] Checkout 3.1.x in build.xml

.coveralls.yml

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

.gitattributes

@@ -8,5 +8,4 @@ phpunit.xml.*	export-ignore
 README.md	export-ignore
 git-tools/	export-ignore
 .coveralls.yml	export-ignore
-composer.phar	export-ignore
-composer.lock	export-ignore
+build.xml	export-ignore

.gitignore

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

.travis.yml

@@ -1,72 +0,0 @@
-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

@@ -17,5 +17,7 @@ The extension is currently under heavy development and not supported until furth
 ## 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)
+2.1.x - [![Build Status](https://travis-ci.org/board3/Board3-Portal.svg?branch=2.1.x)](https://travis-ci.org/board3/Board3-Portal)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/board3/Board3-Portal/badges/quality-score.png?b=2.1.x)](https://scrutinizer-ci.com/g/board3/Board3-Portal/?branch=2.1.x)
+[![Code Coverage](https://scrutinizer-ci.com/g/board3/Board3-Portal/badges/coverage.png?b=2.1.x)](https://scrutinizer-ci.com/g/board3/Board3-Portal/?branch=2.1.x)
+

acp/portal_info.php

@@ -19,11 +19,10 @@ class portal_info
 		return array(
 			'filename'	=> '\board3\portal\acp\portal_module',
 			'title'		=> 'ACP_PORTAL',
-			'version'	=> '2.0.0b2',
+			'version'	=> '2.1.0',
 			'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')),
+				'config'		=> array('title' => 'ACP_PORTAL_GENERAL_INFO',	'auth' => 'ext_board3/portal && acl_a_manage_portal', 'cat' => array('ACP_PORTAL')),
+				'modules'		=> array('title' => 'ACP_PORTAL_MODULES',	'auth' => 'ext_board3/portal && acl_a_manage_portal', 'cat' => array('ACP_PORTAL')),
 			),
 		);
 	}

adm/style/portal/acp_portal_calendar.html

@@ -80,7 +80,7 @@
 	</form>
 
 <!-- ELSE -->
-	<form id="acp_portal_calendar" method="post" action="{U_ACTION}">
+	<form id="acp_portal_calendar" method="post" action="{B3P_U_ACTION}">
 	<!-- IF SHOW_MODULE_OPTIONS -->
 	<fieldset>
 		<legend>{L_MODULE_OPTIONS}</legend>
@@ -149,47 +149,47 @@
 	</fieldset>
 
 	<fieldset>
-	<legend>{L_ACP_PORTAL_EVENTS}</legend>
-	<fieldset class="tabulated">
+		<legend>{L_ACP_PORTAL_EVENTS}</legend>
+		<fieldset class="tabulated">
 
-	<p class="quick">
-		<input class="button2" name="add" type="submit" value="{L_ADD_EVENT}" />
-	</p>
+		<p class="quick">
+			<input class="button2" name="add" type="submit" value="{L_ADD_EVENT}" />
+		</p>
 
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_EVENT_TITLE}</th>
-		<th>{L_EVENT_DESC}</th>
-		<th>{L_EVENT_TIME}</th>
-		<th>{L_EVENT_LINK}</th>
-		<th>{L_ACTION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN events -->
-		<!-- 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}{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>
-		</td>
-	</tr>
-	<!-- BEGINELSE -->
-	<tr class="row1">
-		<td style="text-align: center;" colspan="5">{L_NO_EVENTS}</td>
-	</tr>
-	<!-- END events -->
-	</tbody>
-	</table>
-	<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}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
+		<table style="cellspacing: 1;">
+		<thead>
+		<tr>
+			<th>{L_EVENT_TITLE}</th>
+			<th>{L_EVENT_DESC}</th>
+			<th>{L_EVENT_TIME}</th>
+			<th>{L_EVENT_LINK}</th>
+			<th>{L_ACTION}</th>
+		</tr>
+		</thead>
+		<tbody>
+		<!-- BEGIN events -->
+			<!-- 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}{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>
+			</td>
+		</tr>
+		<!-- BEGINELSE -->
+		<tr class="row1">
+			<td style="text-align: center;" colspan="5">{L_NO_EVENTS}</td>
+		</tr>
+		<!-- END events -->
+		</tbody>
+		</table>
+		<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}" />
+		</p>
+		{S_FORM_TOKEN}
+		</fieldset>
 	</fieldset>
 	</form>
 

adm/style/portal/acp_portal_config.html

@@ -13,31 +13,6 @@
 	</div>
 <!-- ENDIF -->
 
-<!-- BEGIN mods -->
-
-	<fieldset>
-		<legend>{L_VERSION_CHECK}</legend>
-		<p style="font-weight: bold; color: <!-- IF mods.S_UP_TO_DATE -->#228822<!-- ELSE -->#BC2A4D<!-- ENDIF -->;">{mods.UP_TO_DATE}</p>
-		<dl>
-			<dt><label>{L_CURRENT_VERSION}</label></dt>
-			<dd><strong>{mods.CURRENT_VERSION}</strong></dd>
-		</dl>
-		<dl>
-			<dt><label>{L_LATEST_VERSION}</label></dt>
-			<dd><strong>{mods.LATEST_VERSION}</strong></dd>
-		</dl>
-		<!-- IF not mods.S_UP_TO_DATE -->
-			<dl>
-				<dt><label>{L_DOWNLOAD_LATEST}</label></dt>
-				<dd><strong><a href="{mods.DOWNLOAD}">{L_DOWNLOAD} {mods.TITLE} {mods.LATEST_VERSION}</a></strong></dd>
-			</dl>
-			<dl>
-				<dt><label>{L_ANNOUNCEMENT_TOPIC}</label></dt>
-				<dd><strong><a href="{mods.ANNOUNCEMENT}">{L_RELEASE_ANNOUNCEMENT}</a></strong></dd>
-			</dl>
-		<!-- ENDIF -->
-	</fieldset>
-<!-- END mods -->
 <form id="acp_portal_config" method="post" action="{B3P_U_ACTION}">
 <!-- IF SHOW_MODULE_OPTIONS -->
 		<fieldset>

adm/style/portal/acp_portal_links.html

@@ -54,6 +54,7 @@
 	</dl>
 	<p class="submit-buttons">
 		<input type="hidden" name="action" value="save" />
+		<!-- IF LINK_ID !== '' --><input type="hidden" name="id" value="{LINK_ID}" /><!-- ENDIF -->
 
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
@@ -63,7 +64,7 @@
 	</form>
 
 <!-- ELSE -->
-	<form id="acp_portal_links" method="post" action="{U_ACTION}">
+	<form id="acp_portal_links" method="post" action="{B3P_U_ACTION}">
 	<!-- IF SHOW_MODULE_OPTIONS -->
 	<fieldset>
 		<legend>{L_MODULE_OPTIONS}</legend>
@@ -138,7 +139,7 @@
 		<input class="button2" name="add" type="submit" value="{L_ACP_PORTAL_LINK_ADD}" />
 	</p>
 
-	<table cellspacing="1">
+	<table style="cellspacing: 1;">
 	<thead>
 	<tr>
 		<th>{L_ACP_PORTAL_LINK_TITLE}</th>

adm/style/portal/acp_portal_menu.html

@@ -61,6 +61,7 @@
 	</div>
 	<p class="submit-buttons">
 		<input type="hidden" name="action" value="save" />
+		<!-- IF LINK_ID !== '' --><input type="hidden" name="id" value="{LINK_ID}" /><!-- ENDIF -->
 
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
@@ -70,7 +71,7 @@
 	</form>
 
 <!-- ELSE -->
-	<form id="acp_portal_links" method="post" action="{U_ACTION}">
+	<form id="acp_portal_links" method="post" action="{B3P_U_ACTION}">
 	<!-- IF SHOW_MODULE_OPTIONS -->
 	<fieldset>
 		<legend>{L_MODULE_OPTIONS}</legend>
@@ -145,7 +146,7 @@
 		<input class="button2" name="add" type="submit" value="{L_ACP_PORTAL_MENU_ADD}" />
 	</p>
 
-	<table cellspacing="1">
+	<table style="cellspacing: 1;">
 	<thead>
 	<tr>
 		<th>{L_ACP_PORTAL_MENU_TITLE}</th>

adm/style/portal/acp_portal_modules.html

@@ -45,7 +45,7 @@
 <h1>{L_ACP_PORTAL_MODULES}</h1>
 <p>{L_ACP_PORTAL_MODULES_EXP}</p>
 
-<form id="acp_portal_modules" method="post" action="{U_ACTION}" data-ajax="true">
+<form id="acp_portal_modules" method="post" action="{B3P_U_ACTION}" data-ajax="true">
 	<fieldset class="tabulated">
 	<legend>{L_ACP_PORTAL_MODULES}</legend>
 

adm/style/portal/acp_portal_upload_module.html

@@ -1,63 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h1>{L_TITLE}</h1>
-
-<p>{L_TITLE_EXPLAIN}</p>
-
-<!-- IF S_ERROR -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
-<!-- ENDIF -->
-
-<!-- IF not S_MOD_SUCCESSBOX -->
-<form action="{U_ACTION}" method="post" id="mod_upload"{S_FORM_ENCTYPE}>
-	<fieldset>
-		<legend>{L_MODULE_UPLOAD}</legend>
-		<dl>
-			<dt>{L_MODULE_UPLOAD_EXP}</dt>
-			<dd>
-			<input type="file" name="modupload" id="modupload" value="" style="width:50%" />
-			{S_FORM_TOKEN}
-			<br /><br /><input type="submit" name="submit" value="{L_MODULE_UPLOAD_GO}" id="submit" class="button1" />
-			</dd>
-		</dl>
-	</fieldset>
-</form>
-<!-- ELSE -->
-<div class="successbox">
-	<p>{MESSAGE}</p>
-	<br />
-	<p><a href="{U_RETURN}">{L_BACK}</a></p>
-</div>
-	<fieldset>
-		<legend>{L_PORTAL_NEW_FILES}</legend>
-
-		<table cellspacing="1">
-			<col class="row1" /><col class="row1" /><col class="row2" />
-		<thead>
-		<tr>
-			<th>{L_PORTAL_MODULE_SOURCE}</th>
-			<th>{L_PORTAL_MODULE_TARGET}</th>
-			<th>{L_PORTAL_MODULE_STATUS}</th>
-		</tr>
-		</thead>
-		<tbody>
-			<!-- BEGIN new_files -->
-				<tr>
-					<td><strong>{new_files.SOURCE}<!-- IF new_files.S_MISSING_FILE -->&nbsp;&nbsp;&nbsp;<strong><font color="red">({L_FILE_MISSING})</font><!-- ENDIF --></strong></td>
-					<td>{new_files.TARGET}</td>
-					<!-- IF S_INSTALL -->
-						<td style="<!-- IF new_files.S_SUCCESS -->color: green;">{L_PORTAL_MODULE_SUCCESS}<!-- ELSE -->color: red;">{L_PORTAL_MODULE_ERROR}<!-- ENDIF --></td>
-					<!-- ENDIF -->
-				</tr>
-			<!-- END new_files -->
-		</tbody>
-		</table>
-	</fieldset>
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->

adm/style/portal/ajax.js

@@ -13,33 +13,39 @@ phpbb.addAjaxCallback('b3p_move_module_up', function(res) {
 		return;
 	}
 
-	var el = $(this).parents('tr:first'),
-		trSwap = el.prev(),
-		elClass = trSwap.attr('class'),
-		trSwapClass = el.attr('class');
+	var $bottomRow = $(this).parents('tr:first'),
+		$topRow = $bottomRow.prev(),
+		topRowClass = $topRow.attr('class'),
+		bottomRowClass = $bottomRow.attr('class');
 
-	el.insertBefore(trSwap);
-	el.attr('class', elClass);
-	trSwap.attr('class', trSwapClass);
+	$bottomRow.insertBefore($topRow);
+	if (bottomRowClass !== 'row3' && topRowClass !== 'row3') {
+		$bottomRow.attr('class', topRowClass);
+		$topRow.attr('class', bottomRowClass);
+	} else if (bottomRowClass === 'row3') {
+		$topRow.attr('class', (topRowClass === 'row1') ? 'row2' : 'row1');
+	} else if (topRowClass === 'row3') {
+		$bottomRow.attr('class', (bottomRowClass === 'row1') ? 'row2' : 'row1');
+	}
 
 	// Swap images if swap element is first row
-	var swapIsFirstRow = trSwap.find('img[src*="icon_up_disabled"]').parents('span:first').is(':visible');
+	var swapIsFirstRow = $topRow.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();
+		$topRow.find('img[src*="icon_up_disabled"]').parents('span:first').toggle();
+		$topRow.find('img[src*="icon_up."]').parents('span:first').toggle();
+		$bottomRow.find('img[src*="icon_up."]').parents('span:first').toggle();
+		$bottomRow.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');
+	var elIsLastRow = $bottomRow.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();
+		$topRow.find('img[src*="icon_down_disabled"]').parents('span:first').toggle();
+		$topRow.find('img[src*="icon_down."]').parents('span:first').toggle();
+		$bottomRow.find('img[src*="icon_down."]').parents('span:first').toggle();
+		$bottomRow.find('img[src*="icon_down_disabled"]').parents('span:first').toggle();
 	}
 });
 
@@ -48,33 +54,39 @@ phpbb.addAjaxCallback('b3p_move_module_down', function(res) {
 		return;
 	}
 
-	var el = $(this).parents('tr:first'),
-		trSwap = el.next(),
-		elClass = trSwap.attr('class'),
-		trSwapClass = el.attr('class');
+	var $topRow = $(this).parents('tr:first'),
+		$bottomRow = $topRow.next(),
+		bottomRowClass = $bottomRow.attr('class'),
+		topRowClass = $topRow.attr('class');
 
-	el.insertAfter(trSwap);
-	el.attr('class', elClass);
-	trSwap.attr('class', trSwapClass);
+	$topRow.insertAfter($bottomRow);
+	if (bottomRowClass !== 'row3' && topRowClass !== 'row3') {
+		$bottomRow.attr('class', topRowClass);
+		$topRow.attr('class', bottomRowClass);
+	} else if (bottomRowClass === 'row3') {
+		$topRow.attr('class', (topRowClass === 'row1') ? 'row2' : 'row1');
+	} else if (topRowClass === 'row3') {
+		$bottomRow.attr('class', (bottomRowClass === 'row1') ? 'row2' : 'row1');
+	}
 
 	// Swap images if swap element is last row
-	var swapIsLastRow = trSwap.find('img[src*="icon_down_disabled"]').parents('span:first').is(':visible');
+	var swapIsLastRow = $bottomRow.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();
+		$bottomRow.find('img[src*="icon_down_disabled"]').parents('span:first').toggle();
+		$bottomRow.find('img[src*="icon_down."]').parents('span:first').toggle();
+		$topRow.find('img[src*="icon_down."]').parents('span:first').toggle();
+		$topRow.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');
+	var elIsFirstRow = $topRow.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();
+		$bottomRow.find('img[src*="icon_up_disabled"]').parents('span:first').toggle();
+		$bottomRow.find('img[src*="icon_up."]').parents('span:first').toggle();
+		$topRow.find('img[src*="icon_up."]').parents('span:first').toggle();
+		$topRow.find('img[src*="icon_up_disabled"]').parents('span:first').toggle();
 	}
 });
 
@@ -83,16 +95,20 @@ phpbb.addAjaxCallback('b3p_delete_module', function(res) {
 		return;
 	}
 
-	var el = $(this).parents('tr:first'),
-		nextEl = el.next();
+	var $deletedRow = $(this).parents('tr:first'),
+		$nextRow = $deletedRow.next();
 
-	el.remove();
+	$deletedRow.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();
+	while ($nextRow !== undefined && $nextRow.is('tr')) {
+		var nextRowClass = ($nextRow.attr('class') === 'row1') ? 'row2' : 'row1';
+
+		if ($nextRow.attr('class') !== 'row3') {
+			$nextRow.attr('class', nextRowClass);
+		}
+
+		$nextRow = $nextRow.next();
 	}
 });
 

composer.json

@@ -3,38 +3,39 @@
 	"type": "phpbb-extension",
 	"description": "Adds a portal with several blocks to your forum. You can change the settings, move the blocks, add new blocks and more in the ACP.",
 	"homepage": "http://www.board3.de",
-	"version": "2.1.0-b1",
-	"time": "2014-08-24 14:02:18",
+	"version": "2.1.0",
+	"time": "2015-08-04 12:49:14",
 	"license": "GPL-2.0",
-	"authors": [{
+	"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.*"
+		"marc1706/phpbb-text-shortener": "^0.1.0"
 	},
 	"require-dev": {
-		"satooshi/php-coveralls": "dev-master",
 		"phpbb/epv": "dev-master"
 	},
 	"extra": {
 		"display-name": "Board3 Portal",
 		"soft-require": {
-			"phpbb/phpbb": ">=3.1.0-RC3,<3.2.*@dev"
+			"phpbb/phpbb": ">=3.1.5,<3.4.*@dev"
 		},
 		"version-check": {
-			"host": "board3.de",
-			"directory": "/updatecheck",
-			"filename": "board3_portal.json"
+			"host": "www.phpbb.com",
+			"directory": "/customise/db/extension/board3_portal_ext",
+			"filename": "version_check"
 		}
 	}
 }

composer.lock

@@ -1,812 +0,0 @@
-{
-    "_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

@@ -2,315 +2,310 @@ 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
+            - '@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 }
-
+            - {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
+            - '@auth'
+            - '@config'
+            - '@board3.portal.modules_helper'
+            - '@template'
+            - '@dbal.conn'
+            - '@request'
+            - '%core.php_ext%'
+            - '%core.root_path%'
+            - '@user'
         tags:
-            - { name: board3.portal.module }
-
+            - {name: board3.portal.module}
     board3.portal.module.birthday_list:
         class: board3\portal\modules\birthday_list
         arguments:
-            - @config
-            - @template
-            - @dbal.conn
-            - @user
+            - '@config'
+            - '@template'
+            - '@dbal.conn'
+            - '@user'
         tags:
-            - { name: board3.portal.module }
-
+            - {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
+            - '@config'
+            - '@board3.portal.modules_helper'
+            - '@template'
+            - '@dbal.conn'
+            - '@request'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@user'
+            - '@path_helper'
+            - '@log'
         tags:
-            - { name: board3.portal.module }
-
+            - {name: board3.portal.module}
     board3.portal.module.clock:
         class: board3\portal\modules\clock
+        arguments:
+            - '@config'
+            - '@template'
         tags:
-            - { name: board3.portal.module }
-
+            - {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
+            - '@config'
+            - '@template'
+            - '@dbal.conn'
+            - '@request'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@user'
+            - '@log'
         tags:
-            - { name: board3.portal.module }
-
+            - {name: board3.portal.module}
     board3.portal.module.donation:
         class: board3\portal\modules\donation
         arguments:
-            - @config
-            - @template
-            - @user
+            - '@config'
+            - '@request'
+            - '@template'
+            - '@user'
+            - '@board3.portal.modules_helper'
         tags:
-            - { name: board3.portal.module }
-
+            - {name: board3.portal.module}
     board3.portal.module.forumlist:
         class: board3\portal\modules\forumlist
         arguments:
-            - @auth
-            - @config
-            - @template
-            - %core.root_path%
-            - %core.php_ext%
-            - @user
+            - '@auth'
+            - '@config'
+            - '@template'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@user'
         tags:
-            - { name: board3.portal.module }
-
+            - {name: board3.portal.module}
     board3.portal.module.friends:
         class: board3\portal\modules\friends
         arguments:
-            - @auth
-            - @config
-            - @dbal.conn
-            - @template
-            - @user
+            - '@auth'
+            - '@config'
+            - '@dbal.conn'
+            - '@template'
+            - '@user'
         tags:
-            - { name: board3.portal.module }
-
+            - {name: board3.portal.module}
     board3.portal.module.latest_bots:
         class: board3\portal\modules\latest_bots
         arguments:
-            - @config
-            - @dbal.conn
-            - @template
-            - @user
+            - '@config'
+            - '@dbal.conn'
+            - '@template'
+            - '@user'
         tags:
-            - { name: board3.portal.module }
-
+            - {name: board3.portal.module}
     board3.portal.module.latest_members:
         class: board3\portal\modules\latest_members
         arguments:
-            - @config
-            - @dbal.conn
-            - @template
-            - @user
+            - '@config'
+            - '@dbal.conn'
+            - '@template'
+            - '@user'
         tags:
-            - { name: board3.portal.module }
-
+            - {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
+            - '@auth'
+            - '@config'
+            - '@dbal.conn'
+            - '@template'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@user'
         tags:
-            - { name: board3.portal.module }
-
+            - {name: board3.portal.module}
     board3.portal.module.link_us:
         class: board3\portal\modules\link_us
         arguments:
-            - @config
-            - @template
-            - @user
+            - '@config'
+            - '@template'
+            - '@user'
         tags:
-            - { name: board3.portal.module }
-
+            - {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
+            - '@config'
+            - '@dbal.conn'
+            - '@request'
+            - '@template'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@user'
+            - '@log'
         tags:
-            - { name: board3.portal.module }
-
+            - {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
+            - '@config'
+            - '@dbal.conn'
+            - '@request'
+            - '@template'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@user'
+            - '@log'
         tags:
-            - { name: board3.portal.module }
-
+            - {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
+            - '@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 }
-
+            - {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
+            - '@auth'
+            - '@config'
+            - '@dbal.conn'
+            - '@request'
+            - '@template'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@user'
+            - '@board3.portal.modules_helper'
         tags:
-            - { name: board3.portal.module }
-
+            - {name: board3.portal.module}
     board3.portal.module.random_member:
         class: board3\portal\modules\random_member
         arguments:
-            - @dbal.conn
-            - @template
-            - @user
+            - '@dbal.conn'
+            - '@template'
+            - '@user'
         tags:
-            - { name: board3.portal.module }
-
+            - {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%
+            - '@auth'
+            - '@config'
+            - '@dbal.conn'
+            - '@request'
+            - '@template'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
-            - { name: board3.portal.module }
-
+            - {name: board3.portal.module}
     board3.portal.module.search:
         class: board3\portal\modules\search
         arguments:
-            - @template
-            - %core.php_ext%
-            - %core.root_path%
+            - '@template'
+            - '%core.php_ext%'
+            - '%core.root_path%'
         tags:
-            - { name: board3.portal.module }
-
+            - {name: board3.portal.module}
     board3.portal.module.statistics:
         class: board3\portal\modules\statistics
         arguments:
-            - @cache
-            - @config
-            - @dbal.conn
-            - @template
-            - @user
+            - '@cache'
+            - '@config'
+            - '@dbal.conn'
+            - '@template'
+            - '@user'
         tags:
-            - { name: board3.portal.module }
-
+            - {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
+            - '@config'
+            - '@board3.portal.modules_helper'
+            - '@template'
+            - '@dbal.conn'
+            - '@request'
+            - '@user'
         tags:
-            - { name: board3.portal.module }
-
+            - {name: board3.portal.module}
     board3.portal.module.topposters:
         class: board3\portal\modules\topposters
         arguments:
-            - @config
-            - @dbal.conn
-            - @template
-            - %core.root_path%
-            - %core.php_ext%
+            - '@config'
+            - '@dbal.conn'
+            - '@template'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
-            - { name: board3.portal.module }
-
+            - {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%
+            - '@auth'
+            - '@config'
+            - '@controller.helper'
+            - '@dbal.conn'
+            - '@path_helper'
+            - '@template'
+            - '@user'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
-            - { name: board3.portal.module }
-
+            - {name: board3.portal.module}
     board3.portal.module.welcome:
         class: board3\portal\modules\welcome
         arguments:
-            - @config
-            - @request
-            - @template
-            - @user
-            - %core.root_path%
-            - %core.php_ext%
+            - '@config'
+            - '@request'
+            - '@template'
+            - '@user'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
-            - { name: board3.portal.module }
-
+            - {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%
+            - '@auth'
+            - '@config'
+            - '@dbal.conn'
+            - '@template'
+            - '@user'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+        tags:
+            - {name: board3.portal.module}
+    board3.portal.module.portal_tl_menu:
+        class: board3\portal\modules\portal_tl_menu
+        arguments:
+            - '@config'
+            - '@dbal.conn'
+            - '@request'
+            - '@template'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@user'
+            - '@log'
         tags:
             - { name: board3.portal.module }

config/routing.yml

@@ -1,13 +1,8 @@
-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 }
+board3_portal_controller:
+    path: /portal
+    defaults:
+        _controller: 'board3.portal.main:handle'
+board3_portal_redirect_controller:
+    path: /
+    defaults:
+        _controller: 'board3.portal.main:handle'

config/services.yml

@@ -1,91 +1,94 @@
-imports:
-    - { resource: modules.yml }
-
-parameters:
-    board3.version_data:
-        author: Marc
-        title: Board3 Portal
-        tag: board3_portal_v2_dev
-        version: board3_portal_version
-        file:
-            - board3.de
-            - updatecheck
-            - board3_portal.xml
-    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
-        arguments:
-            - %board3.version_data%
-            - @config
-            - %core.root_path%
-            - %core.php_ext%
-            - @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:
-            - @controller.helper
-            - @path_helper
-            - @template
-            - @user
-            - %core.php_ext%
-        tags:
-            - { name: event.listener }
+imports:
+    -
+        resource: modules.yml
+parameters:
+    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:
+            - '@board3.portal.columns'
+            - '@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'
+            - '@board3.portal.columns'
+            - '@config'
+            - '@template'
+            - '@user'
+            - '@path_helper'
+            - '@board3.portal.helper'
+            - '%core.root_path%'
+            - .%core.php_ext%
+    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'
+            - '@controller.helper'
+            - '@request'
+    board3.portal.columns:
+        class: board3\portal\portal\columns
+    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:
+            - '@board3.portal.main'
+            - '@auth'
+            - '@config'
+            - '@controller.helper'
+            - '@path_helper'
+            - '@template'
+            - '@user'
+            - '%core.php_ext%'
+        tags:
+            - {name: event.listener}
+    board3.portal.modules.manager:
+        class: board3\portal\portal\modules\manager
+        arguments:
+            - '@cache'
+            - '@dbal.conn'
+            - '@board3.portal.controller_helper'
+            - '@board3.portal.columns'
+            - '@board3.portal.helper'
+            - '@board3.portal.modules.constraints_handler'
+            - '@board3.portal.modules.database_handler'
+            - '@request'
+            - '@user'
+    board3.portal.modules.database_handler:
+        class: board3\portal\portal\modules\database_handler
+        arguments:
+            - '@dbal.conn'
+    board3.portal.modules.constraints_handler:
+        class: board3\portal\portal\modules\constraints_handler
+        arguments:
+            - '@board3.portal.columns'
+            - '@user'

controller/helper.php

@@ -11,6 +11,9 @@ namespace board3\portal\controller;
 
 class helper
 {
+	/** @var \board3\portal\portal\columns */
+	protected $portal_columns;
+
 	/**
 	* Auth object
 	* @var \phpbb\auth\auth
@@ -71,11 +74,15 @@ class helper
 	*/
 	protected $portal_modules;
 
+	/** @var int Board3 module disabled */
+	const B3_MODULE_DISABLED = 0;
+
 	/**
 	* 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 \board3\portal\portal\columns $portal_columns Board3 Portal columns object
 	* @param \phpbb\config\config $config phpBB Config object
 	* @param \phpbb\template $template Template object
 	* @param \phpbb\user $user User object
@@ -84,9 +91,10 @@ class helper
 	* @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)
+	public function __construct($auth, $portal_columns, $config, $template, $user, $path_helper, $portal_helper, $phpbb_root_path, $php_ext)
 	{
 		$this->auth = $auth;
+		$this->portal_columns = $portal_columns;
 		$this->config = $config;
 		$this->template = $template;
 		$this->user = $user;
@@ -95,7 +103,7 @@ class helper
 		$this->php_ext = $php_ext;
 		$this->portal_helper = $portal_helper;
 
-		$this->root_path = $phpbb_root_path . 'ext/board3/portal/';
+		$this->root_path = str_replace($this->path_helper->get_web_root_path(), '', $phpbb_root_path . 'ext/board3/portal/');
 	}
 
 	/**
@@ -106,7 +114,7 @@ class helper
 	*/
 	protected function check_permission()
 	{
-		if (!isset($this->config['board3_enable']) || !$this->config['board3_enable'] || !$this->auth->acl_get('u_view_portal'))
+		if (empty($this->config['board3_enable']) || !$this->auth->acl_get('u_view_portal'))
 		{
 			redirect(append_sid($this->phpbb_root_path . 'index' . $this->php_ext));
 		}
@@ -134,7 +142,7 @@ class helper
 	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'])))
+		if ($row['module_status'] == self::B3_MODULE_DISABLED || !is_object($module = $this->portal_helper->get_module($row['module_classname'])))
 		{
 			return false;
 		}
@@ -161,13 +169,17 @@ class helper
 	*/
 	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');
+		return ($this->config['board3_left_column'] === false && $this->portal_columns->number_to_string($row['module_column']) === 'left') || ($this->config['board3_right_column'] === false && $this->portal_columns->number_to_string($row['module_column']) === 'right');
 	}
 
 	/**
-	* Check if user is in required groups
+	* Check if user is in required groups.
+	* If the group_ary is empty, this means that there are no limitation on
+	* which groups can see this module.
 	*
 	* @param array $row Module row
+	*
+	* @return bool True if group has access, false if not
 	*/
 	protected function check_group_access($row)
 	{
@@ -191,7 +203,15 @@ class helper
 	{
 		if ($language_file = $module->get_language())
 		{
-			$this->user->add_lang_ext('board3/portal', 'modules/' . $language_file);
+			// Load language file from vendor if specified
+			if (is_array($language_file))
+			{
+				$this->user->add_lang_ext($language_file['vendor'], $language_file['file']);
+			}
+			else
+			{
+				$this->user->add_lang_ext('board3/portal', 'modules/' . $language_file);
+			}
 		}
 	}
 
@@ -207,9 +227,9 @@ class helper
 	{
 		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'],
+			$this->template->assign_block_vars('modules_' . $this->portal_columns->number_to_string($row['module_column']), array(
+				'TEMPLATE_FILE'			=> $this->parse_template_file($template_module['template']),
+				'IMAGE_SRC'			=> $this->path_helper->get_web_root_path() . ltrim($this->root_path . 'styles/all/theme/images/portal/' . $template_module['image_src'], './'),
 				'TITLE'				=> $template_module['title'],
 				'CODE'				=> $template_module['code'],
 				'MODULE_ID'			=> $row['module_id'],
@@ -219,9 +239,9 @@ class helper
 		}
 		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'],
+			$this->template->assign_block_vars('modules_' . $this->portal_columns->number_to_string($row['module_column']), array(
+				'TEMPLATE_FILE'			=> $this->parse_template_file($template_module),
+				'IMAGE_SRC'			=> $this->path_helper->get_web_root_path() . ltrim($this->root_path . 'styles/all/theme/images/portal/' . $row['module_image_src'], './'),
 				'IMAGE_WIDTH'			=> $row['module_image_width'],
 				'IMAGE_HEIGHT'			=> $row['module_image_height'],
 				'MODULE_ID'			=> $row['module_id'],
@@ -246,4 +266,21 @@ class helper
 		// Obtain portal config
 		obtain_portal_config();
 	}
+
+	/**
+	 * Parse template file by prefixing default modules with the portal path
+	 *
+	 * @param string $template_file HTML template
+	 *
+	 * @return string Parsed template file
+	 */
+	protected function parse_template_file($template_file)
+	{
+		if (strpos($template_file, '@') === false)
+		{
+			$template_file = 'portal/modules/' . $template_file;
+		}
+
+		return $template_file;
+	}
 }

controller/main.php

@@ -11,6 +11,9 @@ namespace board3\portal\controller;
 
 class main
 {
+	/** @var \board3\portal\portal\columns */
+	protected $portal_columns;
+
 	/**
 	* phpBB Config object
 	* @var \phpbb\config\config
@@ -25,7 +28,7 @@ class main
 
 	/**
 	* Template object
-	* @var \phpbb\template
+	* @var \phpbb\template\template
 	*/
 	protected $template;
 
@@ -77,13 +80,20 @@ class main
 	*/
 	protected $portal_modules;
 
+	/** @var int Allowed columns */
+	protected $allowed_columns;
+
+	/** @var bool Portal active flag */
+	protected $portal_active = false;
+
 	/**
 	* 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 \board3\portal\portal\columns $portal_columns Board3 Portal columns object
 	* @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\template\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
@@ -91,10 +101,11 @@ class main
 	* @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)
+	public function __construct($portal_columns, $config, $controller_helper, $template, $user, $path_helper, $phpbb_root_path, $php_ext, $config_table, $modules_table)
 	{
 		global $portal_root_path;
 
+		$this->portal_columns = $portal_columns;
 		$this->config = $config;
 		$this->controller_helper = $controller_helper;
 		$this->template = $template;
@@ -111,8 +122,6 @@ class main
 
 		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);
 		}
 	}
@@ -120,12 +129,27 @@ class main
 	/**
 	* Extension front handler method. This is called automatically when your extension is accessed
 	* through index.php?ext=example/foobar
+	*
+	* @param array $columns Columns to display
+	*
 	* @return null
 	*/
-	public function handle()
+	public function handle($columns = array())
 	{
+		// Do not run portal if it's already active
+		if ($this->portal_active)
+		{
+			return;
+		}
+
 		$this->controller_helper->run_initial_tasks();
 
+		// Set portal active
+		$this->portal_active = true;
+
+		// Check if we should limit the columns to display
+		$this->set_allowed_columns($columns);
+
 		// Set default data
 		$this->portal_modules = obtain_portal_modules();
 		$display_online = false;
@@ -178,6 +202,14 @@ class main
 		// Assign specific vars
 		$this->assign_template_vars();
 
+		// Return if columns were specified. Columns are only specified if
+		// portal columns are displayed on pages other than the portal itself.
+		if ($this->allowed_columns !== 0)
+		{
+			$this->template->assign_var('S_PORTAL_ALL', true);
+			return;
+		}
+
 		// And now to output the page.
 		page_header($this->user->lang('PORTAL'), $display_online);
 
@@ -203,9 +235,16 @@ class main
 	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'])
+		$column = $this->portal_columns->number_to_string($row['module_column']);
+
+		// Make sure we should actually load this module
+		if (!$this->display_module_allowed($this->portal_columns->string_to_constant($column)))
+		{
+			return false;
+		}
+
+		if ($this->is_enabled_side_column($column))
 		{
 			++$this->module_count[$column];
 			$template_module = $module->get_template_side($row['module_id']);
@@ -219,6 +258,18 @@ class main
 		return $template_module;
 	}
 
+	/**
+	 * Check if column is enabled side column
+	 *
+	 * @param string $column Column string
+	 *
+	 * @return bool True if column is side column and enabled, false if not
+	 */
+	protected function is_enabled_side_column($column)
+	{
+		return in_array($column, array('left', 'right')) && ($this->config['board3_' . $column . '_column'] || $this->allowed_columns);
+	}
+
 	/**
 	* Check if portal needs to redirect to index page
 	*/
@@ -249,7 +300,7 @@ class main
 			'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/',
+			'T_EXT_THEME_PATH'		=> $this->path_helper->get_web_root_path() . ltrim($this->root_path . 'styles/' . $this->user->style['style_path'] . '/theme/', './'),
 		));
 	}
 
@@ -263,7 +314,7 @@ class main
 	*/
 	protected function check_module_count($column, $config = true)
 	{
-		return $this->module_count[$column] > 0 && $config;
+		return $this->module_count[$column] > 0 && ($config || $this->allowed_columns);
 	}
 
 	/**
@@ -279,4 +330,36 @@ class main
 			make_jumpbox(append_sid("{$this->phpbb_root_path}viewforum{$this->php_ext}"));
 		}
 	}
+
+	/**
+	 * Check whether displaying the module is allowed
+	 *
+	 * @param int $module_column The column of the module
+	 *
+	 * @return bool True if module can be displayed, false if not
+	 */
+	protected function display_module_allowed($module_column)
+	{
+		return ($this->allowed_columns > 0) ? (bool) ($this->allowed_columns & $module_column) : true;
+	}
+
+	/**
+	 * Set allowed columns based on supplied columns array
+	 *
+	 * @param array $columns Allowed columns
+	 */
+	protected function set_allowed_columns($columns)
+	{
+		if (!empty($columns))
+		{
+			foreach ($columns as $column => $show)
+			{
+				$this->allowed_columns |= ($show) ? $this->portal_columns->string_to_constant($column) : 0;
+			}
+		}
+		else
+		{
+			$this->allowed_columns = 0;
+		}
+	}
 }

event/listener.php

@@ -13,6 +13,15 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 class listener implements EventSubscriberInterface
 {
+	/** @var \board3\portal\controller\main */
+	protected $board3_controller;
+
+	/** @var \phpbb\auth\auth */
+	protected $auth;
+
+	/** @var \phpbb\config\config */
+	protected $config;
+
 	/** @var \phpbb\controller\helper */
 	protected $controller_helper;
 
@@ -31,14 +40,20 @@ class listener implements EventSubscriberInterface
 	/**
 	* Constructor of Board3 Portal event listener
 	*
+	* @param \board3\portal\controller\main $board3_controller Board3 Portal controller
+	* @param \phpbb\auth\auth		$auth	phpBB auth object
+	* @param \phpbb\config\config		$config phpBB config
 	* @param \phpbb\controller\helper	$controller_helper	Controller helper object
 	* @param \phpbb\path_helper		$path_helper		phpBB path helper
 	* @param \phpbb\template\template	$template		Template object
 	* @param \phpbb\user			$user			User object
 	* @param string				$php_ext		phpEx
 	*/
-	public function __construct(\phpbb\controller\helper $controller_helper, \phpbb\path_helper $path_helper, \phpbb\template\template $template, \phpbb\user $user, $php_ext)
+	public function __construct(\board3\portal\controller\main $board3_controller, \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->board3_controller = $board3_controller;
+		$this->auth = $auth;
+		$this->config = $config;
 		$this->controller_helper = $controller_helper;
 		$this->path_helper = $path_helper;
 		$this->template = $template;
@@ -57,6 +72,7 @@ class listener implements EventSubscriberInterface
 			'core.user_setup'			=> 'load_portal_language',
 			'core.viewonline_overwrite_location'	=> 'viewonline_page',
 			'core.page_header'			=> 'add_portal_link',
+			'core.permissions'			=> 'load_permissions',
 		);
 	}
 
@@ -92,15 +108,21 @@ class listener implements EventSubscriberInterface
 	}
 
 	/**
-	* Add portal link
+	* Add portal link if user is authed to see it
 	*
 	* @return null
 	*/
 	public function add_portal_link()
 	{
-		if (strpos($this->user->data['session_page'], '/portal') === false)
+		if (!$this->has_portal_access())
+		{
+			return;
+		}
+
+		if (strpos($this->controller_helper->get_current_url(), '/portal') === false)
 		{
 			$portal_link = $this->controller_helper->route('board3_portal_controller');
+			$this->check_portal_all();
 		}
 		else
 		{
@@ -111,4 +133,60 @@ class listener implements EventSubscriberInterface
 			'U_PORTAL'	=> $portal_link,
 		));
 	}
+
+	/**
+	 * Check if user should be able to access portal
+	 *
+	 * @return bool True of user should be able to access it, false if not
+	 */
+	protected function has_portal_access()
+	{
+		return $this->auth->acl_get('u_view_portal') && $this->config['board3_enable'];
+	}
+
+	/**
+	 * Check if portal on all pages should be shown and display it accordignly
+	 */
+	protected function check_portal_all()
+	{
+		// Check if we should show the portal
+		if (isset($this->config['board3_show_all_pages']) && $this->config['board3_show_all_pages'] && !$this->board_disabled())
+		{
+			$this->display_portal();
+		}
+	}
+
+	/**
+	 * Display portal on all pages
+	 */
+	protected function display_portal()
+	{
+		$this->board3_controller->handle(array(
+			'left'	=> $this->config['board3_show_all_side'] == false,
+			'right'	=> $this->config['board3_show_all_side'] == true,
+		));
+	}
+
+	/**
+	 * Check whether the board has been disabled and should not be shown
+	 *
+	 * @return bool True if board has been disabled, false if not
+	 */
+	protected function board_disabled()
+	{
+		return $this->config['board_disable'] && !defined('SKIP_CHECK_DISABLED') && !$this->auth->acl_gets('a_', 'm_') && !$this->auth->acl_getf_global('m_');
+	}
+
+	/**
+	 * Load permissions into permissions array
+	 *
+	 * @param array $event Event data
+	 */
+	public function load_permissions($event)
+	{
+		$permissions = $event['permissions'];
+		$permissions['a_manage_portal'] = array('lang' => 'ACL_A_MANAGE_PORTAL', 'cat' => 'misc');
+		$permissions['u_view_portal'] = array('lang' => 'ACL_U_VIEW_PORTAL', 'cat' => 'misc');
+		$event['permissions'] = $permissions;
+	}
 }

ext.php

@@ -1,16 +0,0 @@
-<?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
-{
-}

includes/constants.php

@@ -1,15 +0,0 @@
-<?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

@@ -1,4 +1,5 @@
 <?php
+// @codingStandardsIgnoreFile
 /**
 *
 * @package Board3 Portal v2.1
@@ -7,6 +8,14 @@
 *
 */
 
+/**
+ * @ignore
+ */
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 // Get portal config
 function obtain_portal_config()
 {
@@ -61,32 +70,26 @@ function set_portal_config($config_name, $config_value)
 }
 
 /**
-* Get portal modules
-*/
+ * Get portal modules
+ *
+ * @return array Portal modules array
+ */
 function obtain_portal_modules()
 {
-	global $db, $cache, $portal_modules;
+	global $db;
 
-	if (($portal_modules = $cache->get('portal_modules')) === false || defined('DEBUG'))
+	$portal_modules = array();
+
+	$sql = 'SELECT *
+		FROM ' . PORTAL_MODULES_TABLE . '
+		ORDER BY module_order ASC';
+	$result = $db->sql_query($sql, 3600);
+
+	while ($row = $db->sql_fetchrow($result))
 	{
-		$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);
+		$portal_modules[] = $row;
 	}
-
+	$db->sql_freeresult($result);
 	return $portal_modules;
 }
 
@@ -125,27 +128,6 @@ function character_limit(&$title, $limit = 0)
 	}
 }
 
-/**
-* 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);
@@ -155,26 +137,26 @@ function ap_validate($str)
 /**
 * 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 = '')
+function generate_portal_pagination($base_url, $num_items, $per_page, $start_item, $type, $module_id = 0, $add_prevnext_text = false, $tpl_prefix = '')
 {
 	global $template, $user;
 
 	switch ($type)
 	{
 		case "announcements":
-			$pagination_type = 'ap';
-			$anker = '#a';
+			$pagination_type = 'ap_' . $module_id;
+			$anker = '#a_' . $module_id;
 		break;
 		case "news":
 		case "news_all":
-			$pagination_type = 'np';
-			$anker = '#n';
+			$pagination_type = 'np_' . $module_id;
+			$anker = '#n_' . $module_id;
 		break;
 
 		default:
 			// this shouldn't happen but default to announcements
-			$pagination_type = 'ap';
-			$anker = '#a';
+			$pagination_type = 'ap_' . $module_id;
+			$anker = '#a_' . $module_id;
 	}
 
 	// Make sure $per_page is a valid value
@@ -191,7 +173,7 @@ function generate_portal_pagination($base_url, $num_items, $per_page, $start_ite
 	$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>';
+	$page_string = ($on_page == 1) ? '<ul><li class="active"><span>1</span></li>' : '<ul><li><a class="button" href="' . $base_url . $anker .'" role="button">1</a></li>';
 
 	if ($total_pages > 5)
 	{
@@ -203,7 +185,7 @@ function generate_portal_pagination($base_url, $num_items, $per_page, $start_ite
 
 		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>';
+			$page_string .= ($i == $on_page) ? '<li class="active"><span>' . $i . '</span></li>' : '<li><a class="button" href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . (($i - 1) * $per_page) . $anker . '" role="button">' . $i . '</a></li>';
 			if ($i < $end_cnt - 1)
 			{
 				$page_string .= $seperator;
@@ -219,25 +201,25 @@ function generate_portal_pagination($base_url, $num_items, $per_page, $start_ite
 
 		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>';
+			$page_string .= ($i == $on_page) ? '<li class="active"><span>' . $i . '</span></li>' : '<li><a class="button" href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . (($i - 1) * $per_page) . $anker . '" role="button">' . $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>';
+	$page_string .= ($on_page == $total_pages) ? '<li class="active"><span>' . $total_pages . '</span></li></ul>' : '<li><a class="button" href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . (($total_pages - 1) * $per_page) . $anker . '" role="button">' . $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;
+			$page_string = '<a class="button" href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . (($on_page - 2) * $per_page) . $anker . '" role="button">' . $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>';
+			$page_string .= '&nbsp;&nbsp;<a class="button" href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . ($on_page * $per_page) . $anker . '" role="button">' . $user->lang['NEXT'] . '</a>';
 		}
 	}
 
@@ -254,29 +236,6 @@ function generate_portal_pagination($base_url, $num_items, $per_page, $start_ite
 	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
@@ -309,9 +268,9 @@ function get_portal_tracking_info($fetch_news)
 			$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);
+				FROM ' . TOPICS_TRACK_TABLE . '
+				WHERE user_id =  ' . (int) $user->data['user_id'] . '
+					AND ' . $db->sql_in_set('topic_id', $current_forum);
 			$result = $db->sql_query($sql);
 
 			while ($row = $db->sql_fetchrow($result))
@@ -325,9 +284,9 @@ function get_portal_tracking_info($fetch_news)
 			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);
+					FROM ' . FORUMS_TRACK_TABLE . '
+					WHERE user_id =  ' . (int) $user->data['user_id'] . '
+						AND ' . $db->sql_in_set('forum_id', $forum_ids);
 				$result = $db->sql_query($sql);
 
 				while ($row = $db->sql_fetchrow($result))
@@ -336,10 +295,10 @@ function get_portal_tracking_info($fetch_news)
 				}
 				$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)
+				// Set user last mark time
+				foreach ($forum_ids as $current_forum_id)
 				{
-					$user_lastmark[$current_forum] = (isset($mark_time[$current_forum])) ? $mark_time[$current_forum] : $user->data['user_lastmark'];
+					$user_lastmark[$current_forum_id] = (isset($mark_time[$current_forum_id])) ? $mark_time[$current_forum_id] : $user->data['user_lastmark'];
 				}
 
 				// @todo: also check if $user_lastmark has been defined for this specific forum_id
@@ -424,36 +383,24 @@ function get_portal_tracking_info($fetch_news)
 */
 function check_file_src($value, $key, $module_id, $force_error = true)
 {
-	global $db, $phpbb_root_path, $phpEx, $user;
+	global $phpbb_admin_path, $portal_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))
+	// We check if the chosen file is present in the styles/all/ folder
+	if (!file_exists($portal_root_path . 'styles/all/theme/images/portal/' . $value))
 	{
-		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 />';
-		}
+		$error .= $user->lang['B3P_FILE_NOT_FOUND'] . ': styles/all/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;
+			trigger_error($error . adm_back_link(append_sid("{$phpbb_admin_path}index.$phpEx", 'i=\board3\portal\acp\portal_module&amp;mode=config&amp;module_id=' . $module_id)), E_USER_WARNING);
 		}
+
+		return $error;
 	}
 	else
 	{
@@ -474,13 +421,15 @@ function get_user_groups()
 
 	if ($groups_ary === false)
 	{
+		$groups_ary = array();
+
 		// 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))
+		while ($row = $db->sql_fetchrow($result))
 		{
 			$groups_ary[] = $row['group_id'];
 		}

includes/functions_modules.php

@@ -1,65 +0,0 @@
-<?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
-*
-*/
-
-function column_num_string($column)
-{
-	switch ($column)
-	{
-		case 1:
-			return 'left';
-		case 2:
-			return 'center';
-		case 3:
-			return 'right';
-		case 4:
-			return 'top';
-		case 5:
-			return 'bottom';
-		default:
-			return 0;
-	}
-}
-
-function column_string_num($column)
-{
-	switch ($column)
-	{
-		case 'left':
-			return 1;
-		case 'center':
-			return 2;
-		case 'right':
-			return 3;
-		case 'top':
-			return 4;
-		case 'bottom':
-			return 5;
-		default:
-			return 0;
-	}
-}
-
-function column_string_const($column)
-{
-	switch ($column)
-	{
-		case 'top':
-			return 1;
-		case 'left':
-			return 2;
-		case 'center':
-			return 4;
-		case 'right':
-			return 8;
-		case 'bottom':
-			return 16;
-		default:
-			return 0;
-	}
-}

includes/functions_upload.php

@@ -1,354 +0,0 @@
-<?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;
-
-/**
-* @ignore
-*/
-class portal_upload
-{
-	/*
-	* pre-defined vars
-	*/
-	private $upload_path;
-	private $u_action;
-
-	/*
-	* constructor function
-	*/
-	public function __construct($path, $u_action)
-	{
-		// This shouldn't happen, but we check for it anyways
-		if(is_dir($path))
-		{
-			$this->upload_path = $path;
-			$this->u_action = $u_action;
-
-			$this->upload_file();
-		}
-	}
-
-	/**
-	* upload module zip
-	*/
-	private function upload_file()
-	{
-		global $user, $phpbb_root_path, $phpEx, $phpbb_admin_path, $template;
-		// Upload part
-		$user->add_lang('posting');  // For error messages
-		include($phpbb_root_path . 'includes/functions_upload.' . $phpEx);
-		$upload = new fileupload();
-		// Only allow ZIP files
-		$upload->set_allowed_extensions(array('zip'));
-
-		$file = $upload->form_upload('modupload');
-
-		// this is for module zips so don't allow anything else
-		if (empty($file->filename) || !preg_match('.zip.', $file->get('realname')))
-		{
-			trigger_error($user->lang['NO_FILE_B3P'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-		else
-		{
-			if (!$file->init_error && !sizeof($file->error))
-			{
-				$file->clean_filename('real');
-				$file->move_file(str_replace($phpbb_root_path, '', $this->upload_path), true, true);
-
-				if (!sizeof($file->error))
-				{
-					include($phpbb_root_path . 'includes/functions_compress.' . $phpEx);
-					$mod_dir = $this->upload_path . str_replace('.zip', '', $file->get('realname'));
-					// make sure we don't already have the new folder
-					if(is_dir($mod_dir))
-					{
-						$this->directory_delete($mod_dir);
-					}
-
-					$compress = new compress_zip('r', $file->destination_file);
-					$compress->extract($mod_dir . '_tmp/');
-					$compress->close();
-					$folder_contents = $this->cut_folder(scandir($mod_dir . '_tmp/', 1));  // This ensures dir is at index 0
-
-					// We need to check if there's a main directory inside the temp MOD directory
-					if (sizeof($folder_contents) == 1)
-					{
-						// We need to move that directory then
-						$this->directory_move($mod_dir . '_tmp/' . $folder_contents[0], $this->upload_path . $folder_contents[0]);
-						$new_mod_dir = $this->upload_path . $folder_contents[0];
-
-					}
-					else if (!is_dir($mod_dir))
-					{
-						// Change the name of the directory by moving to directory without _tmp in it
-						$this->directory_move($mod_dir . '_tmp/', $mod_dir);
-						$new_mod_dir = $mod_dir;
-					}
-
-					$this->directory_delete($mod_dir . '_tmp/');
-
-					// make sure we set $mod_dir to the correct folder after the above step
-					$mod_dir = (isset($new_mod_dir)) ? $new_mod_dir : $mod_dir;
-
-					// if we got until here set $actions['NEW_FILES']
-					$actions['NEW_FILES'] = array();
-
-					// 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, FilesystemIterator::SKIP_DOTS)); // requires PHP 5
-
-					foreach($iterator as $cur_file)
-					{
-						$cur_path = $cur_file->getPathname();
-						$cur_path = str_replace('\\', '/', $cur_path); // we want unix-like paths
-						$cur_path = str_replace($mod_dir . '/', '', $cur_path);
-						$cut_pos = strpos($cur_path, '/');
-
-						// 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')
-						{
-							$file->remove();
-							$this->directory_delete($mod_dir);
-							trigger_error($user->lang['MODULE_CORRUPTED'] . adm_back_link(append_sid("{$phpbb_admin_path}index.$phpEx", 'i=portal&amp;mode=modules')), E_USER_WARNING);
-						}
-						else
-						{
-							$actions['NEW_FILES'][$mod_dir . '/' . $cur_path] = $phpbb_root_path . $cur_path;
-						}
-					}
-
-					if (!sizeof($file->error))
-					{
-						// Let's start moving our files where they belong
-						foreach ($actions['NEW_FILES'] as $source => $target)
-						{
-							/*
-							* make sure we don't try to copy folders
-							* folders will be created if necessary in copy_content
-							*/
-							if(is_dir($source))
-							{
-								continue;
-							}
-							$status = $this->copy_content($source, $target);
-
-							if ($status !== true && !is_null($status))
-							{
-								$module_installed = false;
-							}
-
-							$template->assign_block_vars('new_files', array(
-								'S_SUCCESS'			=> ($status === true) ? true : false,
-								'S_NO_COPY_ATTEMPT'	=> (is_null($status)) ? true : false,
-								'SOURCE'			=> $source,
-								'TARGET'			=> $target,
-							));
-						}
-
-						$template->assign_vars(array(
-							'S_MOD_SUCCESSBOX'	=> true,
-							'MESSAGE'			=> $user->lang['MODULE_UPLOADED'],
-							'U_RETURN'			=> append_sid("{$phpbb_admin_path}index.$phpEx", 'i=portal&amp;mode=modules'),
-							'S_INSTALL'			=> true,
-						));
-					}
-				}
-			}
-			$file->remove();
-			$this->directory_delete($mod_dir);
-			if ($file->init_error || sizeof($file->error))
-			{
-				trigger_error((sizeof($file->error) ? implode('<br />', $file->error) : $user->lang['MOD_UPLOAD_INIT_FAIL']) . adm_back_link($this->u_action), E_USER_WARNING);
-			}
-
-			$this->tpl_name = 'portal/acp_portal_upload_module';
-			$this->page_title = $user->lang['ACP_PORTAL_UPLOAD'];
-
-			$template->assign_vars(array(
-			'L_TITLE'			=> $user->lang['ACP_PORTAL_UPLOAD'],
-			'L_TITLE_EXPLAIN'	=> '',
-
-			'S_ERROR'			=> false, // if we get here, there was no error or we can ignore it
-			'ERROR_MSG'			=> '',
-
-			'U_ACTION'			=> $this->u_action,
-		));
-		}
-	}
-
-	/**
-	* Cuts the unneeded '.' and '..' from the folder content info scandir returns
-	*
-	* @return: cut array
-	*/
-	private function cut_folder($folder_content)
-	{
-		$cut_array = array('.', '..');
-		$folder_content = array_diff($folder_content, $cut_array);
-
-		return $folder_content;
-	}
-
-	private function directory_move($src, $dest)
-	{
-		$src_contents = scandir($src);
-
-		if (!is_dir($dest) && is_dir($src))
-		{
-			mkdir($dest . '/', 0755);
-		}
-
-		foreach ($src_contents as $src_entry)
-		{
-			if ($src_entry != '.' && $src_entry != '..')
-			{
-				if (is_dir($src . '/' . $src_entry) && !is_dir($dest . '/' . $src_entry))
-				{
-					$this->directory_move($src . '/' . $src_entry, $dest . '/' . $src_entry);
-				}
-				else if (is_file($src . '/' . $src_entry) && !is_file($dest . '/' . $src_entry))
-				{
-					@copy($src . '/' . $src_entry, $dest . '/' . $src_entry);
-					@chmod($dest . '/' . $src_entry, 0644);
-				}
-			}
-		}
-	}
-
-	/**
-	* the following functions are from the AutoMOD package
-	* @copyright (c) 2008 phpBB Group
-	* @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
-	*/
-
-	private function directory_delete($dir)
-	{
-		if (!file_exists($dir))
-		{
-			return true;
-		}
-
-		if (!is_dir($dir) && is_file($dir))
-		{
-			@chmod($dir, 0644);
-			return @unlink($dir);
-		}
-
-		foreach (scandir($dir) as $item)
-		{
-			if ($item == '.' || $item == '..')
-			{
-				continue;
-			}
-			if (!$this->directory_delete($dir . "/" . $item))
-			{
-				@chmod($dir . "/" . $item, 0644);
-				if (!$this->directory_delete($dir . "/" . $item))
-				{
-					return false;
-				}
-			}
-		}
-
-		return @rmdir($dir);
-	}
-
-	/**
-	* Moves files or complete directories
-	*
-	* @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
-	* 
-	* NOTE: function should preferably not return in case of failure on only one file.  
-	* 	The current method makes error handling difficult 
-	*/
-	private function copy_content($from, $to = '', $strip = '')
-	{
-		global $phpbb_root_path, $user, $config;
-
-		if (strpos($from, $phpbb_root_path) !== 0)
-		{
-			$from = $phpbb_root_path . $from;
-		}
-
-		if (strpos($to, $phpbb_root_path) !== 0)
-		{
-			$to = $phpbb_root_path . $to;
-		}
-
-		$dirname_check = dirname($to);
-
-		if (!is_dir($dirname_check))
-		{
-			if ($this->recursive_mkdir($dirname_check) === false)
-			{
-				return sprintf($user->lang['MODULE_UPLOAD_MKDIR_FAILURE'], $dirname_check);
-			}
-		}
-
-		// leave a backup file if it already exists
-		if(file_exists($to))
-		{
-			// remove old backup file first
-			if(file_exists($to . '.bak'))
-			{
-				@chmod($to . '.bak', 0644);
-				unlink($to . '.bak');
-			}
-			@rename($to, $to . '.bak');
-			@chmod($to, 0644);
-		}
-
-		if (!@copy($from, $to))
-		{
-			return sprintf($user->lang['MODULE_COPY_FAILURE'], $to);
-		}
-		@chmod($to, 0644);
-
-		return true;
-	}
-
-	/**
-	* @author Michal Nazarewicz (from the php manual)
-	* Creates all non-existent directories in a path
-	* @param $path - path to create
-	* @param $mode - CHMOD the new dir to these permissions
-	* @return bool
-	*/
-	private function recursive_mkdir($path, $mode = false)
-	{
-		if (!$mode)
-		{
-			$mode = octdec(0777);
-		}
-
-		$dirs = explode('/', $path);
-		$count = sizeof($dirs);
-		$path = '.';
-		for ($i = 0; $i < $count; $i++)
-		{
-			$path .= '/' . $dirs[$i];
-
-			if (!is_dir($path))
-			{
-				@mkdir($path, $mode);
-				@chmod($path, $mode);
-
-				if (!is_dir($path))
-				{
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-}

includes/modules_helper.php

@@ -9,6 +9,8 @@
 
 namespace board3\portal\includes;
 
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+
 class modules_helper
 {
 	/**
@@ -23,6 +25,9 @@ class modules_helper
 	*/
 	protected $config;
 
+	/** @var \phpbb\controller\helper Controller helper */
+	protected $controller_helper;
+
 	/**
 	* phpBB request
 	* @var \phpbb\request\request
@@ -35,12 +40,14 @@ class modules_helper
 	* 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\controller\helper $controller_helper Controller helper
 	* @param \phpbb\request\request $request phpBB request
 	*/
-	public function __construct($auth, $config, $request)
+	public function __construct($auth, $config, $controller_helper, $request)
 	{
 		$this->auth = $auth;
 		$this->config = $config;
+		$this->controller_helper = $controller_helper;
 		$this->request = $request;
 	}
 
@@ -71,14 +78,16 @@ class modules_helper
 	* @param string	$key			Key of select box
 	* @param array	$select_ary		Array of select box options
 	* @param array	$selected_options	Array of selected options
+	* @param bool $multiple Whether multiple options should be selectable
 	*
 	* @return string HTML code of select box
 	* @access public
 	*/
-	public function generate_select_box($key, $select_ary, $selected_options)
+	public function generate_select_box($key, $select_ary, $selected_options, $multiple = false)
 	{
 		// Build options
-		$options = '<select id="' . $key . '" name="' . $key . '[]" multiple="multiple">';
+		$options = '<select id="' . $key . '" name="' . $key;
+		$options .= ($multiple) ? '[]" 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>';
@@ -102,7 +111,7 @@ class modules_helper
 		$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)
+		if (isset($this->config[$key]) && strlen($this->config[$key]) > 0)
 		{
 			$selected_options = explode(',', $this->config[$key]);
 		}
@@ -117,7 +126,7 @@ class modules_helper
 			);
 		}
 
-		return $this->generate_select_box($key, $select_ary, $selected_options);
+		return $this->generate_select_box($key, $select_ary, $selected_options, true);
 	}
 
 	/**
@@ -135,4 +144,48 @@ class modules_helper
 		$news = implode(',', $values);
 		$this->config->set($key, $news);
 	}
+
+	/**
+	 * Wrapper method for controller_helper::route()
+	 *
+	 * @param string $route Route name
+	 * @param array $params Route parameters
+	 * @param bool $is_amp
+	 * @param bool $session_id
+	 * @param bool $reference_type
+	 *
+	 * @return string URL for route
+	 */
+	public function route($route, $params = array(), $is_amp = true, $session_id = false, $reference_type = UrlGeneratorInterface::ABSOLUTE_PATH)
+	{
+		return $this->controller_helper->route($route, $params, $is_amp, $session_id, $reference_type);
+	}
+
+	/**
+	 * Display radio buttons for left/right choice
+	 *
+	 * @param int $value Selected value
+	 * @param string $key Key of config variable
+	 *
+	 * @return string
+	 */
+	public function display_left_right($value, $key)
+	{
+		$radio_ary = array(0 => 'PORTAL_SHOW_ALL_LEFT', 1 => 'PORTAL_SHOW_ALL_RIGHT');
+
+		return h_radio($key, $radio_ary, $value, $key);
+	}
+
+	/**
+	 * Store left right choice
+	 *
+	 * @param string $key Config key
+	 */
+	public function store_left_right($key)
+	{
+		// Get selected side
+		$value = $this->request->variable($key, 0);
+
+		$this->config->set($key, $value);
+	}
 }

includes/version_check.php

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

language/ar/info_acp_portal.php

@@ -0,0 +1,50 @@
+<?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
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* 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'		=> 'الموديلات',
+	'ACP_PORTAL'			=> 'مجلة المنتدى',
+	'ACP_PORTAL_GENERAL_INFO'	=> 'الإعدادات',
+	'ACP_PORTAL_UPLOAD'		=> 'رفع الموديل',
+
+	// Portal logs
+	'LOG_PORTAL_LINK_ADDED'				=> '<strong>تغيير إعدادات المجلة</strong><br />&raquo; تم إضافة الرابط : %s ',
+	'LOG_PORTAL_LINK_UPDATED'			=> '<strong>تغيير إعدادات المجلة</strong><br />&raquo; تم تحديث الرابط : %s ',
+	'LOG_PORTAL_LINK_REMOVED'			=> '<strong>تغيير إعدادات المجلة</strong><br />&raquo; تم إزالة الرابط : %s ',
+	'LOG_PORTAL_EVENT_ADDED'			=> '<strong>تغيير إعدادات المجلة</strong><br />&raquo; تم إضافة حدث : %s ',
+	'LOG_PORTAL_EVENT_UPDATED'			=> '<strong>تغيير إعدادات المجلة</strong><br />&raquo; تم تحديث حدث : %s ',
+	'LOG_PORTAL_EVENT_REMOVED'			=> '<strong>تغيير إعدادات المجلة</strong><br />&raquo; تم إزالة حدث : %s ',
+	'LOG_PORTAL_CONFIG'					=> '<strong>تغيير إعدادات المجلة</strong><br />&raquo; %s',
+));

language/ar/modules/portal_announcements_module.php

@@ -0,0 +1,75 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Announcements
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'LATEST_ANNOUNCEMENTS'		=> 'أحدث الإعلانات العامة',
+	'GLOBAL_ANNOUNCEMENTS'		=> 'إعلانات عامة',
+	'GLOBAL_ANNOUNCEMENT'		=> 'إعلان عام',
+	'VIEW_LATEST_ANNOUNCEMENT'  => '1 إعلان',
+	'VIEW_LATEST_ANNOUNCEMENTS' => '%d إعلانات',
+	'READ_FULL'					=> 'اقرأ المزيد',
+	'NO_ANNOUNCEMENTS'			=> 'لا توجد إعلانات عامة',
+	'POSTED_BY'					=> 'كاتب المُشاركة',
+	'COMMENTS'					=> 'التعليقات',
+	'VIEW_COMMENTS'				=> 'مُشاهدة التعليقات',
+	'PORTAL_POST_REPLY'			=> 'إضافة تعليق',
+	'TOPIC_VIEWS'				=> 'المُشاهدات ',
+	'JUMP_NEWEST'				=> 'انتقل إلى أحدث مُشاركة',
+	'JUMP_FIRST'				=> 'انتقل إلى أول مُشاركة',
+	'JUMP_TO_POST'				=> 'انتقل إلى المُشاركة',
+
+	// ACP
+	'ACP_PORTAL_ANNOUNCE_SETTINGS'				=> 'إعدادات الإعلانات العامة',
+	'ACP_PORTAL_ANNOUNCE_SETTINGS_EXP'		=> 'من هنا تستطيع تخصيص موديل الإعلانات العامة.',
+	'PORTAL_ANNOUNCEMENTS'						=> 'إظهار الإعلانات العامة',
+	'PORTAL_ANNOUNCEMENTS_EXP'				=> 'عرض هذا الموديل في المجلة.',
+	'PORTAL_ANNOUNCEMENTS_STYLE'				=> 'التصميم الإفتراضي ',
+	'PORTAL_ANNOUNCEMENTS_STYLE_EXP'		=> 'اختيارك "نعم" يعني استخدام التصميم الإفتراضي لشكل المنتديات ( بدون محتوى الإعلانات ). اختيارك "لا" يعني استخدام التصميم الخاص بالمجلة ( عرض النص / محتوى الإعلانات ).',
+	'PORTAL_NUMBER_OF_ANNOUNCEMENTS'			=> 'عدد الإعلانات في المجلة ',
+	'PORTAL_NUMBER_OF_ANNOUNCEMENTS_EXP'	=> 'القيمة صفر تعني عدد غير محدود',
+	'PORTAL_ANNOUNCEMENTS_DAY'					=> 'عدد الأيام لعرض الإعلان',
+	'PORTAL_ANNOUNCEMENTS_DAY_EXP'			=> 'سيتم إخفاء الإعلانات بعد القيمة التي تحددها هنا. القيمة صفر تعني عدد غير محدود',
+	'PORTAL_ANNOUNCEMENTS_LENGTH'				=> 'الحد الأقصى لطول / عدد حروف الإعلانات العامة ',
+	'PORTAL_ANNOUNCEMENTS_LENGTH_EXP'		=> 'القيمة صفر تعني عدد غير محدود',
+	'PORTAL_GLOBAL_ANNOUNCEMENTS_FORUM'			=> 'المنتديات ',
+	'PORTAL_GLOBAL_ANNOUNCEMENTS_FORUM_EXP'	=> 'حدد المنتديات التي تريد إظهار الإعلانات منها. عدم التحديد يعني إظهار الإعلانات من جميع المنتديات. <br />تستطيع هنا كذلك تحديد المنتديات التي تريد استثنائها من الإعلانات بشرط أن تختار "نعم" في الخيار أدناه ( استثناء المنتديات ). <br />تستطيع تحديد أو إلغاء التحديد لأكثر من منتدى بواسطة النقر مطولاً على زر الكنترول <samp>CTRL</samp> والتحديد بالماوس على المنتديات المطلوبة.',
+	'PORTAL_ANNOUNCEMENTS_FORUM_EXCLUDE'		=> 'استثناء المنتديات ',
+	'PORTAL_ANNOUNCEMENTS_FORUM_EXCLUDE_EXP'=> 'اختار "نعم" إذا تريد استثناء الإعلانات من المنتديات التي حددتها في الخيار أعلاه ( المنتديات ). اختار "لا" لتعطيل هذا الخيار.',
+	'PORTAL_ANNOUNCEMENTS_PERMISSIONS'			=> 'تفعيل / تعطيل الصلاحيات ',
+	'PORTAL_ANNOUNCEMENTS_PERMISSIONS_EXP'	=> 'سيتم تطبيق نفس صلاحيات العضو لمًشاهدة المنتدى على هذا الموديل.',
+	'PORTAL_ANNOUNCEMENTS_ARCHIVE'				=> 'تفعيل نظام الأرشفة ',
+	'PORTAL_ANNOUNCEMENTS_ARCHIVE_EXP'		=> 'اختيارك "نعم" يعني إظهار أرقام الصفحات / نظام الأرشفة للإعلانات.',
+	'PORTAL_SHOW_REPLIES_VIEWS'				=> 'إظهار عدد الردود و المُشاهدات ',
+	'PORTAL_SHOW_REPLIES_VIEWS_EXP'		=> 'هذه الإعدادات متعلقة بالتصميم الإفتراضي.<br />سيتم عرض عدد الردود و المُشاهدات في 2 أعمدة إضافية عند اختيارك "نعم". سيتم عرض عدد الردود و المُشاهدات بجانب اسم المنتدى عند اختيارك "لا". <br />يُنصح بإختيار "لا" في حالة وجود مشاكل في ظهور الأعمدة الإضافية والتي تتطلب مساحة أكبر.',
+));

language/ar/modules/portal_attachments_module.php

@@ -0,0 +1,55 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Attachments
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'DOWNLOADS'				=> 'عدد التحميلات ',
+	'NO_ATTACHMENTS'		=> 'لا توجد ملفات مُرفقة',
+	'PORTAL_ATTACHMENTS'	=> 'المرفقات',
+
+	// ACP
+	'ACP_PORTAL_ATTACHMENTS_NUMBER_SETTINGS'			=> 'إعدادات المرفقات',
+	'ACP_PORTAL_ATTACHMENTS_NUMBER_SETTINGS_EXP'	=> 'من هنا تستطيع تخصيص موديل المرفقات.',
+	'PORTAL_ATTACHMENTS_NUMBER'							=> 'عدد المرفقات ',
+	'PORTAL_ATTACHMENTS_NUMBER_EXP'					=> 'الحد الأقصى لعدد المرفقات التي سيتم عرضها في الموديل. القيمة صفر يعني عدد غير محدود',
+	'PORTAL_ATTACHMENTS_FORUM_IDS'						=> 'المنتديات ',
+	'PORTAL_ATTACHMENTS_FORUM_IDS_EXP'				=> 'حدد المنتديات التي تريد إظهار المرفقات منها. عدم التحديد يعني إظهار المرفقات من جميع المنتديات. <br />تستطيع هنا كذلك تحديد المنتديات التي تريد استثنائها من المرفقات بشرط أن تختار "نعم" في الخيار أدناه ( استثناء المنتديات ). <br />تستطيع تحديد أو إلغاء التحديد لأكثر من منتدى بواسطة النقر مطولاً على زر الكنترول <samp>CTRL</samp> والتحديد بالماوس على المنتديات المطلوبة.',
+	'PORTAL_ATTACHMENTS_FORUM_EXCLUDE'					=> 'استثناء المنتديات ',
+	'PORTAL_ATTACHMENTS_FORUM_EXCLUDE_EXP'			=> 'اختار "نعم" إذا تريد استثناء المرفقات من المنتديات التي حددتها في الخيار أعلاه ( المنتديات ). اختار "لا" لتعطيل هذا الخيار.',
+	'PORTAL_ATTACHMENTS_MAX_LENGTH'						=> 'عدد حروف أسماء المرفقات ',
+	'PORTAL_ATTACHMENTS_MAX_LENGTH_EXP'				=> 'القيمة صفر تعني غير محدود',
+	'PORTAL_ATTACHMENTS_FILETYPE' 						=> 'أنواع الملفات ',
+	'PORTAL_ATTACHMENTS_FILETYPE_EXP' 				=> 'حدد أنواع الملفات التي تريد عرضها في المرفقات. تستطيع هنا كذلك تحديد أنواع الملفات التي تريد استثنائها من المرفقات بشرط أن تختار "نعم" في الخيار أدناه ( استثناء أنواع الملفات ). <br />تستطيع تحديد أو إلغاء التحديد لأكثر من أنواع الملفات بواسطة النقر مطولاً على زر الكنترول <samp>CTRL</samp> والتحديد بالماوس على الأنواع المطلوبة.',
+	'PORTAL_ATTACHMENTS_EXCLUDE'						=> 'استثناء أنواع الملفات ',
+	'PORTAL_ATTACHMENTS_EXCLUDE_EXP'				=> 'اختار "نعم" إذا تريد استثناء أنواع الملفات التي حددتها في الخيار أعلاه ( أنواع الملفات ). اختار "لا" لتعطيل هذا الخيار.',
+));

language/ar/modules/portal_birthday_list_module.php

@@ -0,0 +1,45 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Birthday List
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'BIRTHDAYS_AHEAD'              => 'خلال الـ %s الأيام القادمة',
+	'NO_BIRTHDAYS_AHEAD'        => 'لا يوجد أعضاء لديهم أعياد ميلاد خلال هذه الفترة.',
+
+	// ACP
+	'ACP_PORTAL_BIRTHDAYS_SETTINGS'			=> 'إعدادات أعياد الميلاد',
+	'ACP_PORTAL_BIRTHDAYS_SETTINGS_EXP'	=> 'من هنا تستطيع تخصيص موديل أعياد الميلاد.',
+	'PORTAL_BIRTHDAYS'						=> 'قائمة أعياد الميلاد',
+	'PORTAL_BIRTHDAYS_AHEAD'				=> 'عدد الأيام لعرض أعياد الميلاد القادمة ',
+	'PORTAL_BIRTHDAYS_AHEAD_EXP'		=> 'عدد الأيام القادمة التي سيكون فيها أعياد ميلاد للأعضاء.<br />القيمة صفر تعني تعطيل قائمة أعياد الميلاد.',
+));

language/ar/modules/portal_calendar_module.php

@@ -0,0 +1,132 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Calendar
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_CALENDAR'			=> 'التقويم',
+	'VIEW_NEXT_MONTH'		=> 'الشهر التالي',
+	'VIEW_PREVIOUS_MONTH'	=> 'الشهر السابق',
+	'EVENT_START'			=> 'من ',
+	'EVENT_END'				=> 'إلى ',
+	'EVENT_TIME'			=> 'التوقيت ',
+	'EVENT_ALL_DAY'			=> 'طوال اليوم ',
+	'CURRENT_EVENTS'		=> 'الأحداث الحالية ',
+	'NO_CUR_EVENTS'			=> 'لا توجد أحداث حالية',
+	'UPCOMING_EVENTS'		=> 'الأحداث القادمة ',
+	'NO_UPCOMING_EVENTS'	=> 'لا توجد أحداث قادمة',
+
+	'mini_cal'	=> array(
+		'day'	=> array(
+			'1'	=> 'أح',
+			'2'	=> 'أث',
+			'3'	=> 'ثل',
+			'4'	=> 'أر',
+			'5'	=> 'خم',
+			'6'	=> 'جم',
+			'7'	=> 'سب',
+		),
+
+		'month'	=> array(
+			'1'	=> 'ينا.',
+			'2'	=> 'فبر.',
+			'3'	=> 'مار.',
+			'4'	=> 'أبر.',
+			'5'	=> 'ماي',
+			'6'	=> 'يول.',
+			'7'	=> 'يون.',
+			'8'	=> 'أغس.',
+			'9'	=> 'سبت.',
+			'10'=> 'أكت.',
+			'11'=> 'نوف.',
+			'12'=> 'ديس.',
+		),
+
+		'long_month'=> array(
+			'1'	=> 'يناير',
+			'2'	=> 'فبراير',
+			'3'	=> 'مارس',
+			'4'	=> 'أبريل',
+			'5'	=> 'مايو',
+			'6'	=> 'يونيو',
+			'7'	=> 'يوليو',
+			'8'	=> 'أغسطس',
+			'9'	=> 'سبتمبر',
+			'10'=> 'أكتوبر',
+			'11'=> 'نوفمبر',
+			'12'=> 'ديسمبر',
+		),
+	),
+
+	// ACP
+	'ACP_PORTAL_CALENDAR'					=> 'إعدادات التقويم',
+	'ACP_PORTAL_CALENDAR_EXP'				=> 'من هنا تستطيع تخصيص موديل التقويم.',
+	'ACP_PORTAL_EVENTS'						=> 'الأحداث',
+	'PORTAL_CALENDAR_TODAY_COLOR'			=> 'لون اليوم الحالي ',
+	'PORTAL_CALENDAR_TODAY_COLOR_EXP'	=> 'تستطيع إضافة أكواد الألوان HEX مثل : #FFFFFF للون الأبيض , أو إضافة أسماء الألوان باللغة الإنجليزية مثل : violet ( البنفسجي ).',
+	'PORTAL_CALENDAR_SUNDAY_COLOR'			=> 'لون يوم الأحد ',
+	'PORTAL_CALENDAR_SUNDAY_COLOR_EXP'	=> 'تستطيع إضافة أكواد الألوان HEX مثل : #FFFFFF للون الأبيض , أو إضافة أسماء الألوان باللغة الإنجليزية مثل : violet ( البنفسجي ).',
+	'PORTAL_LONG_MONTH'						=> 'إظهار الإسم الكامل للشهور ',
+	'PORTAL_LONG_MONTH_EXP'				=> 'أسماء الشهور ستكون مُختصرة عند اختيارك "لا". مثال : سيكون أغس بدلاً من أغسطس.',
+	'PORTAL_SUNDAY_FIRST'					=> 'أول أيام الأسبوع ',
+	'PORTAL_SUNDAY_FIRST_EXP'			=> 'سيبدأ الأسبوع في التقويم من ( الأثنين ) إلى ( الأحد ) عند اختيارك "لا". وسيكون من ( الأحد ) إلى ( السبت ) عند اختيارك "نعم".',
+	'PORTAL_DISPLAY_EVENTS'					=> 'إظهار الأحداث ',
+	'PORTAL_DISPLAY_EVENTS_EXP'				=> 'سيتم عرض الأحداث التي تم إنشائها في موديل التقويم',
+	'PORTAL_EVENTS_MANAGE'					=> 'إدارة الأحداث',
+	'NO_EVENT_TITLE'						=> 'لم يتم إضافة عنوان للحدث.',
+	'NO_EVENT_START'						=> 'لم يتم إضافة تاريخ البداية للحدث.',
+	'ADD_EVENT'								=> 'إضافة حدث جديد',
+	'EVENT_UPDATED'							=> 'تم تحديث الحدث بنجاح.',
+	'EVENT_ADDED'							=> 'تم إضافة الحدث بنجاح.',
+	'NO_EVENT'								=> 'لم يتم تحديد أي حدث.',
+	'EVENT_TITLE'							=> 'عنوان الحدث ',
+	'EVENT_DESC'							=> 'وصف الحدث ',
+	'EVENT_LINK'							=> 'رابط الحدث ',
+	'EVENT_LINK_EXP'						=> 'أدخل الرابط إلى الموضوع أو إلى موقع يحتوي على الإعلان / موضوع مناقشة الحدث.',
+	'NO_EVENTS'								=> 'لا يوجد أحداث',
+	'ACP_PORTAL_CALENDAR_START_INCORRECT'	=> 'توقيت البداية الذي أدخلته غير صحيح. الرجاء اتباع التعليمات بعناية.',
+	'ACP_PORTAL_CALENDAR_END_INCORRECT'		=> 'توقيت النهاية الذي أدخلته غير صحيح. الرجاء اتباع التعليمات بعناية.',
+	'ACP_PORTAL_CALENDAR_EVENT_PAST'		=> 'توقيت بداية الحدث يجب أن يكون في المستقبل.',
+	'ACP_PORTAL_EVENT_START_DATE'			=> 'تاريخ بداية الحدث ',
+	'ACP_PORTAL_EVENT_START_DATE_EXP'		=> 'أدخل تاريخ و وقت بداية الحدث. يجب أن يكون التوقيت على هذا الشكل : MM/DD/YYYY 3:00 PM',
+	'ACP_PORTAL_EVENT_END_DATE'			=> 'تاريخ نهاية الحدث ',
+	'ACP_PORTAL_EVENT_END_DATE_EXP'			=> 'أدخل تاريخ و وقت نهاية الحدث. يجب أن يكون التوقيت على هذا الشكل : MM/DD/YYYY 3:00 PM',
+	'ACP_PORTAL_CALENDAR_EVENT_START_FIRST'	=> 'نهاية الحدث يجب أن يكون بعد بداية الحدث.',
+	'ACP_PORTAL_CALENDAR_PERMISSION'		=> 'الصلاحيات ',
+	'ACP_PORTAL_CALENDAR_PERMISSION_EXP'	=> 'حدد المجموعات التي تستطيع مُشاهدة موديل الأحداث. يجب عليك عدم تحديد أي مجموعة لو تريد عرض هذا الموديل لجميع الأعضاء. <br />تستطيع تحديد أو إلعاء التحديد لأكثر من مجموعة بالنقر باستمرار على زر الكنترول <samp>CTRL</samp> والنقر بنفس الوقت بالماوس على المجموعة المطلوبة.',
+	'PORTAL_EVENTS_URL_NEW_WINDOW'			=> 'افتح الروابط الخارجية للحدث في نافذة جديدة ',
+
+	// Logs
+	'LOG_PORTAL_EVENT_UPDATED'				=> '<strong>تم تحديث الحدث في المجلة</strong><br />&raquo; %s',
+	'LOG_PORTAL_EVENT_ADDED'				=> '<strong>تم إضافة الحدث في المجلة</strong><br />&raquo; %s',
+	'LOG_PORTAL_EVENT_REMOVED'				=> '<strong>تم حذف الحدث في المجلة</strong><br />&raquo; %s',
+));

language/ar/modules/portal_clock_module.php

@@ -0,0 +1,43 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Clock
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'CLOCK'		=> 'Clock',
+
+	// ACP
+	'ACP_PORTAL_CLOCK_SETTINGS'		=> 'إعدادات الساعة',
+	'ACP_PORTAL_CLOCK_SETTINGS_EXP'	=> 'من هنا تستطيع تخصيص الساعة بمنتداك',
+	'ACP_PORTAL_CLOCK_SRC'			=> 'الساعة ',
+	'ACP_PORTAL_CLOCK_SRC_EXP'		=> 'أدخل إسم الملف للساعة التي تريدها. يجب أن يكون الملف في المسار styles/*yourstyle*/theme/images/portal/. *yourstyle* يعني إسم الإستايل الذي تستخدمه.',
+));

language/ar/modules/portal_custom_module.php

@@ -0,0 +1,49 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Custom
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_CUSTOM'		=> 'Custom Block',
+
+	// ACP
+	'ACP_PORTAL_CUSTOM_SETTINGS'			=> 'إعدادات الموديل الخاص',
+	'ACP_PORTAL_CUSTOM_SETTINGS_EXP'		=> 'من هنا تستطيع تخصيص الموديل الخاص',
+	'ACP_PORTAL_CUSTOM_CODE_SHORT'			=> 'الكود البرمجي الذي أدخلته غير كافي. يجب زيادة الكود.',
+	'ACP_PORTAL_CUSTOM_PREVIEW'				=> 'استعراض',
+	'ACP_PORTAL_CUSTOM_CODE'				=> 'المحتوى ',
+	'ACP_PORTAL_CUSTOM_CODE_EXP'			=> 'أدخل الكود الذي سيظهر في هذا الموديل ( المسموح به هو HTML أو BBCode ).',
+	'ACP_PORTAL_CUSTOM_PERMISSION'			=> 'الصلاحيات ',
+	'ACP_PORTAL_CUSTOM_PERMISSION_EXP'		=> 'حدد المجموعات التي تستطيع مُشاهدة هذا الموديل. عدم تحديد أي مجموعة يعني عرض هذا الموديل لجميع الأعضاء.<br />تستطيع تحديد أو إلعاء التحديد لأكثر من مجموعة بالنقر باستمرار على زر الكنترول <samp>CTRL</samp> والنقر بنفس الوقت بالماوس على المجموعة المطلوبة.',
+	'ACP_PORTAL_CUSTOM_BBCODE'				=> 'تفعيل أكواد البي بي ',
+	'ACP_PORTAL_CUSTOM_BBCODE_EXP'			=> 'اختيارك "نعم" يعني استخدام أكواد الـBBCode في صندوق الكتابة أعلاه. اختيارك "لا" يعني استخدام أكواد ال HTML.',
+));

language/ar/modules/portal_donation_module.php

@@ -0,0 +1,68 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Donation
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'DONATION' 		=> 'تبرعات الـPaypal',
+	'DONATION_TEXT'	=> 'التبرعات هي عبارة عن دعم للخدمات التي نقدمها في موقعنا ولا توجد أي نية للحصول على مكاسب مالية منها. نرحب بتبرعاتكم التي ستساعد في تغطية تكاليف السيرفر والإستضافة , إسم النطاق...الخ.',
+	'PAY_MSG'       => 'الرجاء استخدام النقطة العشرية ( . ) وعدم استخدام علامة الفاصلة ( , ). مثال 3.50',
+	'PAY_ITEM'		=> 'تبرع !', // paypal item
+
+	'AUD'						=> 'دولار استرالي (AUD)',
+	'CAD'						=> 'دولار كندي (CAD)',
+	'CZK'						=> 'الكورونا التشيكية (CZK)',
+	'DKK'						=> 'الكرونة الدنماركي (DKK)',
+	'HKD'						=> 'دولار هونج كونج (HKD)',
+	'HUF'						=> 'فورينت هنجاري / مجري (HUF)',
+	'NZD'						=> 'دولار نيوزلاندي (NZD)',
+	'NOK'						=> 'كرونه نرويجي (NOK)',
+	'PLN'						=> 'زلوتي بولندي (PLN)',
+	'GBP'						=> 'جنيه استرليني (GBP)',
+	'SGD'						=> 'دولار سينغافوري (SGD)',
+	'SEK'						=> 'كرونه سويدي (SEK)',
+	'CHF'						=> 'فرنك سويسري (CHF)',
+	'JPY'						=> 'ين ياباني (JPY)',
+	'USD'						=> 'دولار أمريكي (USD)',
+	'EUR'						=> 'يورو (EUR)',
+	'MXN'						=> 'بيزو مكسيكي (MXN)',
+	'ILS'						=> 'شيكل اسرائيلي (ILS)',
+
+	// ACP
+	'ACP_PORTAL_PAYPAL_SETTINGS'			=> 'إعدادات الـ Paypal',
+	'ACP_PORTAL_PAYPAL_SETTINGS_EXP'		=> 'من هنا تستطيع تخصيص موديل التبرعات Paypal.',
+	'PORTAL_PAY_ACC'						=> 'حسابك في الـ Paypal ',
+	'PORTAL_PAY_ACC_EXP'					=> 'أدخل البريد الإلكتروني الخاص بك في موقع الـ Paypal. مثال : xxx@xxx.com',
+	'PORTAL_PAY_CUSTOM'						=> 'إضافة إسم المستخدم إلى تبرعات الـ Paypal',
+	'PORTAL_PAY_DEFAULT'					=> 'العُملة الإفتراضية ',
+	'PORTAL_PAY_DEFAULT_EXP'				=> 'العُملة التي سيتم تحديدها افتراضياً في القائمة المُنسدلة للعُملات.'
+));

language/ar/modules/portal_forumlist_module.php

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

language/ar/modules/portal_friends_module.php

@@ -0,0 +1,48 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Friends
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'FRIENDS'				=> 'الأصدقاء',
+	'FRIENDS_OFFLINE'		=> 'الغير مُتصلين',
+	'FRIENDS_ONLINE'		=> 'المُتصلين',
+	'NO_FRIENDS'			=> 'لا يوجد أصدقاء معروفين حالياً',
+	'NO_FRIENDS_OFFLINE'	=> 'لا يوجد أصدقاء غير مُتصلين',
+	'NO_FRIENDS_ONLINE'		=> 'لا يوجد أصدقاء مُتصلين',
+
+	// ACP
+	'ACP_PORTAL_FRIENDS_SETTINGS'			=> 'إعدادات الإصدقاء',
+	'ACP_PORTAL_FRIENDS_SETTINGS_EXP'	=> 'من هنا تستطيع تخصيص موديل الأصدقاء.',
+	'PORTAL_MAX_ONLINE_FRIENDS'				=> 'عدد الأصدقاء ',
+	'PORTAL_MAX_ONLINE_FRIENDS_EXP'		=> 'الحد الأقصى لعدد الأصدقاء الذين سيتم عرضهم في الموديل.',
+));

language/ar/modules/portal_latest_bots_module.php

@@ -0,0 +1,44 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Latest Bots
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'LATEST_BOTS'			=> 'محركات البحث',
+	'LAST_VISITED_BOTS'		=> 'آخر زيارة لمحركات البحث',
+
+	// ACP
+	'ACP_PORTAL_BOTS_SETTINGS'					=> 'إعدادات محركات البحث',
+	'ACP_PORTAL_BOTS_SETTINGS_EXP'			=> 'من هنا تستطيع تخصيص موديل محركات البحث.',
+	'PORTAL_LAST_VISITED_BOTS_NUMBER'			=> 'عدد محركات البحث ',
+	'PORTAL_LAST_VISITED_BOTS_NUMBER_EXP'	=> 'عدد محركات البحث الذي تريد عرضهم في الموديل. القيمة صفر تعني عدد غير محدود',
+));

language/ar/modules/portal_latest_members_module.php

@@ -0,0 +1,43 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Latest Members
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'LATEST_MEMBERS'	=> 'آخر الأعضاء المُسجلين',
+
+	// ACP
+	'ACP_PORTAL_MEMBERS_SETTINGS'			=> 'إعدادات آخر الأعضاء المُسجلين',
+	'ACP_PORTAL_MEMBERS_SETTINGS_EXP'	=> 'من هنا تستطيع تخصيص موديل آخر الأعضاء المُسجلين.',
+	'PORTAL_MAX_LAST_MEMBER'				=> 'عدد الأعضاء ',
+	'PORTAL_MAX_LAST_MEMBER_EXP'		=> 'الحد الأقصى لعدد آخر الأعضاء المُسجلين الذين سيتم عرضهم. الصفر يعني عدد غير محدود',
+));

language/ar/modules/portal_leaders_module.php

@@ -0,0 +1,45 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Leaders
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'NO_ADMINISTRATORS_P'	=> 'لا يوجد مدراء',
+	'NO_MODERATORS_P'		=> 'لا يوجد مشرفين',
+	'NO_GROUPS_P'			=> 'لا توجد مجموعات',
+
+	// ACP
+	'ACP_PORTAL_LEADERS'		=> 'إعدادات فريق الموقع',
+	'ACP_PORTAL_LEADERS_EXP'	=> 'من هنا تستطيع تخصيص الموديل الخاص بفريق الموقع',
+	'PORTAL_LEADERS_EXT'		=> 'العرض الموسع للمدراء / للفريق ',
+	'PORTAL_LEADERS_EXT_EXP'	=> 'العرض القياسي سيكون لجميع المدراء والمشرفين , بينما العرض الموسع سيتضمن جميع المجموعات الغير المخفية في ألوان المجموعات.',
+));

language/ar/modules/portal_link_us_module.php

@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Link Us
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'LINK_US'		=> 'ارتبط بنا ',
+	'LINK_US_TXT'	=> 'نرجوا عدم التردد في الإرتباط إلى <strong>%s</strong> بواسطة استخدام كود الـHTML التالي في موقعك :',
+));

language/ar/modules/portal_links_module.php

@@ -0,0 +1,57 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Links
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_LINKS'		=> 'الروابط',
+	'LINKS_NO_LINKS'	=> 'لا يوجد روابط',
+
+	// ACP
+	'ACP_PORTAL_LINKS'				=> 'إعدادات الروابط',
+	'ACP_PORTAL_LINKS_EXP'			=> 'من هنا تستطيع تخصيص قائمة الروابط في موديل الروابط',
+	'ACP_PORTAL_LINK_TITLE'			=> 'العنوان',
+	'ACP_PORTAL_LINK_TYPE'			=> 'نوع الرابط ',
+	'ACP_PORTAL_LINK_TYPE_EXP'		=> 'حدد الخيار "رابط داخلي" اذا لديك رابط لأحد صفحات منتداك ولكي تمنع الخروج من منتداك.',
+	'ACP_PORTAL_LINK_INT'			=> 'رابط داخلي',
+	'ACP_PORTAL_LINK_EXT'			=> 'رابط خارجي',
+	'ACP_PORTAL_LINK_ADD'			=> 'إضافة رابط جديد ',
+	'ACP_PORTAL_LINK_URL'			=> 'عنوان الرابط ',
+	'ACP_PORTAL_LINK_URL_EXP'		=> 'الروابط الخارجية :<br />يجب أن تحتوي جميع الروابط على http://<br /><br />الروابط الداخلية :<br />فقط أدخل الملف php file كعنوان رابط , مثال : index.php?style=4.',
+	'ACP_PORTAL_LINK_PERMISSION'	=> 'صلاحيات الرابط ',
+	'ACP_PORTAL_LINK_PERMISSION_EXP'=> 'حدد المجموعات التي تستطيع مُشاهدة الرابط. يجب عليك عدم تحديد أي مجموعة لو تريد عرض هذا الرابط لجميع الأعضاء.<br />تستطيع تحديد أو إلعاء التحديد لأكثر من مجموعة بالنقر باستمرار على زر الكنترول <samp>CTRL</samp> والنقر بنفس الوقت بالماوس على المجموعة المطلوبة.',
+	'ACP_PORTAL_LINKS_NEW_WINDOW'	=> 'فتح الروابط الخارجية في نافذة جديدة ',
+
+	// Errors
+	'NO_LINK_TITLE'					=> 'يجب عليك إضافة عنوان لهذا الرابط.',
+	'NO_LINK_URL'					=> 'يجب عليك إضافة عنوان الرابط.',
+));

language/ar/modules/portal_main_menu_module.php

@@ -0,0 +1,70 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Main Menu
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'M_MENU' 	=> 'القائمة',
+	'M_CONTENT'	=> 'المحتوى',
+	'M_ACP'		=> 'لوحة تحكم المدير',
+	'M_HELP'	=> 'مساعدة',
+	'M_BBCODE'	=> 'دليل BBCode',
+	'M_TERMS'	=> 'شروط الإستخدام',
+	'M_PRV'		=> 'سياسة الخصوصية',
+	'M_SEARCH'	=> 'بحث',
+	'MENU_NO_LINKS'	=> 'لا يوجد روابط',
+
+	// ACP
+	'ACP_PORTAL_MENU'				=> 'إعدادات القائمة',
+	'ACP_PORTAL_MENU_LINK_SETTINGS'	=> 'إعدادات الرابط',
+	'ACP_PORTAL_MENU_EXP'			=> 'من هنا تستطيع تخصيص القائمة الرئيسية',
+	'ACP_PORTAL_MENU_MANAGE'		=> 'إدارة القائمة',
+	'ACP_PORTAL_MENU_MANAGE_EXP'	=> 'من هنا تستطيع إدارة الروابط في القائمة الرئيسية.',
+	'ACP_PORTAL_MENU_CAT'			=> 'القسم',
+	'ACP_PORTAL_MENU_IS_CAT'		=> 'اجعله قسم خاص ',
+	'ACP_PORTAL_MENU_INT'			=> 'داخلي',
+	'ACP_PORTAL_MENU_EXT'			=> 'خارجي',
+	'ACP_PORTAL_MENU_TITLE'			=> 'العنوان ',
+	'ACP_PORTAL_MENU_URL'			=> 'عنوان الرابط ',
+	'ACP_PORTAL_MENU_ADD'			=> 'إضافة رابط تنقل جديد',
+	'ACP_PORTAL_MENU_TYPE'			=> 'نوع الرابط ',
+	'ACP_PORTAL_MENU_TYPE_EXP'		=> 'اختار "داخلي" لو لديك رابط إلى صفحة موجودة في منتداك من أجل منع الخروج الغبر مرغوب به خارج منتداك.',
+	'ACP_PORTAL_MENU_CREATE_CAT'	=> 'يجب عليك أولاً إنشاء قسم.',
+	'ACP_PORTAL_MENU_URL_EXP'		=> 'الروابط الخارجية :<br />يجب أن تحتوي جميع الروابط على http://<br /><br />الروابط الداخلية :<br />يجب أن تضيف فقط ملف الـ php كرابط. مثال : index.php?style=4.',
+	'ACP_PORTAL_MENU_PERMISSION'	=> 'صلاحيات الرابط ',
+	'ACP_PORTAL_MENU_PERMISSION_EXP'=> 'حدد المجموعات التي تستطيع مُشاهدة هذا الرابط. عدم تحديد أي مجموعة يعني عرض هذا الرابط لجميع الأعضاء.<br />تستطيع تحديد أو إلعاء التحديد لأكثر من مجموعة بالنقر باستمرار على زر الكنترول <samp>CTRL</samp> والنقر بنفس الوقت بالماوس على المجموعة المطلوبة.',
+	'ACP_PORTAL_MENU_EXT_NEW_WINDOW'=> 'فتح الروابط الخارجية في نافذة جديدة ',
+
+	// Errors
+	'NO_LINK_TITLE'					=> 'يجب عليك إضافة عنوان لهذا الرابط.',
+	'NO_LINK_URL'					=> 'يجب عليك إضافة الرابط.',
+));

language/ar/modules/portal_news_module.php

@@ -0,0 +1,71 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - News
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'LATEST_NEWS'			=> 'آخر الأخبار',
+	'READ_FULL'				=> 'اقرأ المزيد',
+	'NO_NEWS'				=> 'لا يوجد أخبار',
+	'POSTED_BY'				=> 'كاتب المُشاركة',
+	'COMMENTS'				=> 'التعليقات',
+	'VIEW_COMMENTS'			=> 'مُشاهدة التعليقات',
+	'PORTAL_POST_REPLY'		=> 'إضافة تعليق',
+	'TOPIC_VIEWS'			=> 'المُشاهدات',
+	'JUMP_NEWEST'			=> 'انتقل إلى أحدث مُشاركة',
+	'JUMP_FIRST'			=> 'انتقل إلى أول مُشاركة',
+	'JUMP_TO_POST'			=> 'انتقل إلى المُشاركة',
+
+	// ACP
+	'ACP_PORTAL_NEWS_SETTINGS'			=> 'إعدادات الأخبار',
+	'ACP_PORTAL_NEWS_SETTINGS_EXP'	=> 'من هنا تستطيع تخصيص موديل الأخبار.',
+	'PORTAL_NEWS_STYLE'					=> 'التصميم الإفتراضي ',
+	'PORTAL_NEWS_STYLE_EXP'			=> 'اختيارك "نعم" يعني استخدام التصميم الإفتراضي لشكل المنتديات ( بدون محتوى الأخبار ). اختيارك "لا" يعني استخدام التصميم الخاص بالمجلة ( عرض النص / محتوى الأخبار ).',
+	'PORTAL_SHOW_ALL_NEWS'				=> 'عرض جميع الأخبار ',
+	'PORTAL_SHOW_ALL_NEWS_EXP'		=> 'عرض جميع الأخبار في هذا المنتدى ( يشمل المواضيع المُثبتة ).',
+	'PORTAL_NUMBER_OF_NEWS'				=> 'عدد الأخبار في المجلة ',
+	'PORTAL_NUMBER_OF_NEWS_EXP'		=> 'القيمة صفر تعني عدد غير محدود',
+	'PORTAL_NEWS_LENGTH'				=> 'الحد الأقصى لطول / عدد حروف الأخبار ',
+	'PORTAL_NEWS_LENGTH_EXP'		=> 'القيمة صفر تعني عدد غير محدود',
+	'PORTAL_NEWS_FORUM' 				=> 'المنتديات ',
+	'PORTAL_NEWS_FORUM_EXP' 		=> 'حدد المنتديات التي تريد إظهار الأخبار منها. عدم التحديد يعني إظهار الأخبار من جميع المنتديات. <br />تستطيع هنا كذلك تحديد المنتديات التي تريد استثنائها من الأخبار بشرط أن تختار "نعم" في الخيار أدناه ( استثناء المنتديات ). <br />تستطيع تحديد أو إلغاء التحديد لأكثر من منتدى بواسطة النقر مطولاً على زر الكنترول <samp>CTRL</samp> والتحديد بالماوس على المنتديات المطلوبة.',
+	'PORTAL_NEWS_EXCLUDE'				=> 'استثناء المنتديات ',
+	'PORTAL_NEWS_EXCLUDE_EXP'		=> 'اختار "نعم" إذا تريد استثناء الأخبار من المنتديات التي حددتها في الخيار أعلاه ( المنتديات ). اختار "لا" لتعطيل هذا الخيار.',
+	'PORTAL_NEWS_PERMISSIONS'			=> 'تفعيل / تعطيل الصلاحيات ',
+	'PORTAL_NEWS_PERMISSIONS_EXP'	=> 'سيتم تطبيق نفس صلاحيات العضو لمًشاهدة المنتدى على هذا الموديل.',
+	'PORTAL_NEWS_SHOW_LAST'				=> 'الترتيب بحسب آخر مُشاركة ',
+	'PORTAL_NEWS_SHOW_LAST_EXP'		=> 'اختار "نعم" إذا تريد ترتيب آخر الأخبار بحسب آخر مُشاركة. اختار "لا" إذا تريد الترتيب بحسب آخر موضوع.',
+	'PORTAL_NEWS_ARCHIVE'				=> 'تفعيل نظام الأرشفة ',
+	'PORTAL_NEWS_ARCHIVE_EXP'		=> 'اختيارك "نعم" يعني إظهار أرقام الصفحات / نظام الأرشفة للأخبار.',
+	'PORTAL_SHOW_REPLIES_VIEWS'				=> 'إظهار عدد الردود و المُشاهدات ',
+	'PORTAL_SHOW_REPLIES_VIEWS_EXP'		=> 'هذه الإعدادات متعلقة بالتصميم الإفتراضي.<br />سيتم عرض عدد الردود و المُشاهدات في 2 أعمدة إضافية عند اختيارك "نعم". سيتم عرض عدد الردود و المُشاهدات بجانب اسم المنتدى عند اختيارك "لا". <br />يُنصح بإختيار "لا" في حالة وجود مشاكل في ظهور الأعمدة الإضافية والتي تتطلب مساحة أكبر.',
+));

language/ar/modules/portal_poll_module.php

@@ -0,0 +1,54 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Poll
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_POLL'			=> 'التصويت',
+	'LATEST_POLLS'			=> 'أحدث التصويتات',
+	'NO_OPTIONS'			=> 'لا توجد خيارات في هذا التصويت.',
+	'NO_POLL'				=> 'لا يوجد أي تصويت',
+	'RETURN_PORTAL'			=> '%sالعودة إلى المجلة%s',
+
+	// ACP
+	'ACP_PORTAL_POLLS_SETTINGS'			=> 'إعدادات التصويت',
+	'ACP_PORTAL_POLLS_SETTINGS_EXP'	=> 'من هنا تستطيع تخصيص موديل التصويت.',
+	'PORTAL_POLL_TOPIC_ID'				=> 'المنتديات ',
+	'PORTAL_POLL_TOPIC_ID_EXP'		=> 'حدد المنتديات التي تريد إظهار التصويتات منها. عدم التحديد يعني إظهار التصويتات من جميع المنتديات. <br />تستطيع هنا كذلك تحديد المنتديات التي تريد استثنائها من التصويتات بشرط أن تختار "نعم" في الخيار أدناه ( استثناء المنتديات ). <br />تستطيع تحديد أو إلغاء التحديد لأكثر من منتدى بواسطة النقر مطولاً على زر الكنترول <samp>CTRL</samp> والتحديد بالماوس على المنتديات المطلوبة.',
+	'PORTAL_POLL_EXCLUDE_ID'			=> 'استثناء المنتديات ',
+	'PORTAL_POLL_EXCLUDE_ID_EXP'	=> 'اختار "نعم" إذا تريد استثناء التصويتات من المنتديات التي حددتها في الخيار أعلاه ( المنتديات ). اختار "لا" لتعطيل هذا الخيار.',
+	'PORTAL_POLL_LIMIT'					=> 'عدد التصويتات ',
+	'PORTAL_POLL_LIMIT_EXP'			=> 'عدد التصويتات التي تريد عرضها في صفحة المجلة.',
+	'PORTAL_POLL_ALLOW_VOTE'			=> 'السماح بالتصويت ',
+	'PORTAL_POLL_ALLOW_VOTE_EXP'	=> 'السماح للأعضاء الذين يملكون الصلاحيات المطلوبة بالتصويت بواسطة صفحة المجلة.',
+	'PORTAL_POLL_HIDE'					=> 'إخفاء التصويتات المُنتهية ',
+));

language/ar/modules/portal_random_member_module.php

@@ -0,0 +1,42 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Random Member
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_RANDOM_MEMBER'	=> 'عضو رائع',
+	'RND_JOIN'				=> 'تاريخ الإشتراك ',
+	'RND_POSTS'				=> 'عدد المشاركات ',
+	'RND_OCC'				=> 'المهنة ',
+	'RND_FROM'				=> 'المكان ',
+	'RND_WWW'				=> 'صفحة الموقع ',
+));

language/ar/modules/portal_recent_module.php

@@ -0,0 +1,52 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Recent
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_RECENT'				=> 'أحدث المواضيع',
+	'PORTAL_RECENT_TOPIC'		=> 'أحدث المواضيع',
+	'PORTAL_RECENT_ANN'			=> 'أحدث الإعلانات',
+	'PORTAL_RECENT_HOT_TOPIC'	=> 'أحدث المواضيع النشطة ',
+
+	// ACP
+	'ACP_PORTAL_RECENT_SETTINGS'			=> 'إعدادات أحدث المواضيع',
+	'ACP_PORTAL_RECENT_SETTINGS_EXP'	=> 'من هنا تستطيع تخصيص موديل أحدث المواضيع.',
+	'PORTAL_MAX_TOPIC'						=> 'عدد المواضيع ',
+	'PORTAL_MAX_TOPIC_EXP'				=> 'عدد المواضيع التي ستظهر في هذا الموديل. القيمة صفر تعني عدد غير محدود',
+	'PORTAL_RECENT_TITLE_LIMIT'				=> 'عدد حروف العنوان ',
+	'PORTAL_RECENT_TITLE_LIMIT_EXP'		=> 'عدد حروف عناوين المواضيع التي ستظهر في هذا الموديل. القيمة صفر تعني عدد غير محدود',
+	'PORTAL_RECENT_FORUM'					=> 'المنتديات ',
+	'PORTAL_RECENT_FORUM_EXP'			=> 'حدد المنتديات التي تريد إظهار آخر المواضيع منها. عدم التحديد يعني إظهار آخر المواضيع من جميع المنتديات. <br />تستطيع هنا كذلك تحديد المنتديات التي تريد استثنائها من المرفقات بشرط أن تختار "نعم" في الخيار أدناه ( استثناء المنتديات ). <br />تستطيع تحديد أو إلغاء التحديد لأكثر من منتدى بواسطة النقر مطولاً على زر الكنترول <samp>CTRL</samp> والتحديد بالماوس على المنتديات المطلوبة.',
+	'PORTAL_EXCLUDE_FORUM'					=> 'استثناء المنتديات ',
+	'PORTAL_EXCLUDE_FORUM_EXP'			=> 'اختار "نعم" إذا تريد استثناء آخر المواضيع من المنتديات التي حددتها في الخيار أعلاه ( المنتديات ). اختار "لا" لتعطيل هذا الخيار.',
+));

language/ar/modules/portal_search_module.php

@@ -0,0 +1,43 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Search
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_SEARCH'			=> 'بحث',
+	'PORTAL_SEARCH_GO'		=> 'اذهب',
+	'PORTAL_SEARCH_SITE'	=> 'المنتديات',
+	'PORTAL_SEARCH_POSTS'	=> 'المشاركات',
+	'PORTAL_SEARCH_AUTHOR'	=> 'الكاتب',
+	'PORTAL_SEARCH_ENGINE'	=> 'محركات البحث',
+	'PORTAL_SEARCH_ADV'		=> 'بحث مُتقدم',
+));

language/ar/modules/portal_statistics_module.php

@@ -0,0 +1,52 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Statistics
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'ST_TOP'		=> 'الإجمالي',
+	'ST_TOP_ANNS'	=> 'إجمالي الإعلانات :',
+	'ST_TOP_STICKYS'=> 'إجمالي المواضيع المُثبتة :',
+	'ST_TOT_ATTACH'	=> 'إجمالي المرفقات :',
+	'TOPICS_PER_DAY_OTHER'	=> 'المواضيع يومياً : <strong>%d</strong>',
+	'TOPICS_PER_DAY_ZERO'	=> 'المواضيع يومياً : <strong>0</strong>',
+	'POSTS_PER_DAY_OTHER'	=> 'المُشاركات يومياً : <strong>%d</strong>',
+	'POSTS_PER_DAY_ZERO'	=> 'المُشاركات يومياً : <strong>0</strong>',
+	'USERS_PER_DAY_OTHER'	=> 'الأعضاء يومياً : <strong>%d</strong>',
+	'USERS_PER_DAY_ZERO'	=> 'الأعضاء يومياً : <strong>0</strong>',
+	'TOPICS_PER_USER_OTHER'	=> 'المواضيع لكل عضو : <strong>%d</strong>',
+	'TOPICS_PER_USER_ZERO'	=> 'المواضيع لكل عضو : <strong>0</strong>',
+	'POSTS_PER_USER_OTHER'	=> 'المُشاركات لكل عضو : <strong>%d</strong>',
+	'POSTS_PER_USER_ZERO'	=> 'المُشاركات لكل عضو : <strong>0</strong>',
+	'POSTS_PER_TOPIC_OTHER'	=> 'المُشاركات لكل موضوع : <strong>%d</strong>',
+	'POSTS_PER_TOPIC_ZERO'	=> 'المُشاركات لكل موضوع : <strong>0</strong>',
+));

language/ar/modules/portal_stylechanger_module.php

@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Stylechanger
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'BOARD_STYLE'			=> 'استايل المنتدى',
+	'STYLE_CHOOSE'			=> 'حدد الإستايل',
+));

language/ar/modules/portal_topposters_module.php

@@ -0,0 +1,42 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Topposters
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'TOPPOSTERS'					=> 'أكثر الأعضاء نشاطاً',
+	'TOPPOSTERS_CONFIG'				=> 'إعدادات أكثر الأعضاء نشاطاً',
+
+	// ACP
+	'NUM_TOPPOSTERS'				=> 'عدد الأعضاء ',
+	'NUM_TOPPOSTERS_EXP'			=> 'أدخل عدد الأعضاء الذين تريد عرضهم في موديل أكثر الأعضاء نشاطاً.',
+));

language/ar/modules/portal_user_menu_module.php

@@ -0,0 +1,46 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - User Menu
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'USER_MENU'			=> 'قائمة العضو',
+	'UM_LOG_ME_IN'		=> 'تذكرني',
+	'UM_HIDE_ME'		=> 'أخفني',
+	'UM_REGISTER_NOW'	=> 'التسجيل الآن !',
+	'UM_MAIN_SUBSCRIBED'=> 'الإشتراكات',
+	'UM_BOOKMARKS'		=> 'المواضيع المُفضلة',
+	'M_MENU' 			=> 'القائمة',
+	'M_ACP'				=> 'لوحة تحكم المدير',
+	'USER_MENU_SETTINGS'	=> 'إعدادات قائمة العضو',
+	'USER_MENU_REGISTER'	=> 'عرض رابط التسجيل في قائمة العضو',
+));

language/ar/modules/portal_welcome_module.php

@@ -0,0 +1,44 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Welcome
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_WELCOME'		=> 'رسالة الترحيب',
+
+	// ACP
+	'ACP_PORTAL_WELCOME_SETTINGS'			=> 'إعدادات رسالة الترحيب',
+	'ACP_PORTAL_WELCOME_MESSAGE_SHORT'		=> 'الرسالة التي أدخلتها قصيرة جداً.',
+	'ACP_PORTAL_WELCOME_PREVIEW'			=> 'استعراض رسالة الترحيب',
+	'ACP_PORTAL_WELCOME_MESSAGE'			=> 'رسالة الترحيب ',
+	'ACP_PORTAL_WELCOME_MESSAGE_EXP'		=> 'من هنا تستطيع تغيير رسالة الترحيب. أكواد BBCode / الصور / الروابط مسموح بها.',
+));

language/ar/modules/portal_whois_online_module.php

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

language/ar/permissions_portal.php

@@ -0,0 +1,40 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1
+* @copyright (c) 2015 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* 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(
+	// Adding the permissions
+	'ACL_A_MANAGE_PORTAL'		=> 'يستطيع تغيير إعدادات المجلة',
+	'ACL_U_VIEW_PORTAL'			=> 'يستطيع مُشاهدة المجلة',
+));

language/ar/portal.php

@@ -0,0 +1,42 @@
+<?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
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+
+// Common
+$lang = array_merge($lang, array(
+	'PORTAL'			=> 'المجلة',
+	'VIEWING_PORTAL'                => 'صفحة المجلة',
+	'BACK'				=> 'العودة',
+	'B3P_WRONG_METHOD_CALL'		=> 'طلب غير صحيح للطريقة %s',
+));

language/ar/portal_acp.php

@@ -0,0 +1,110 @@
+<?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
+*
+* Translated By : Bassel Taha Alhitary - www.alhitary.net
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+
+$lang = array_merge($lang, array(
+	// Portal Modules
+	'ACP_PORTAL_MODULES_EXP'		=> 'من هنا تستطيع إدارة الموديلات الخاصة بمجلتك. نرجوا تعطيل المجلة إذا عطلت أيضاً جميع الموديلات ولم تفعل أي موديل.',
+
+	'MODULE_POS_TOP'				=> 'الأعلى',
+	'MODULE_POS_LEFT'				=> 'العمود اليسار',
+	'MODULE_POS_RIGHT'				=> 'العمود اليمين',
+	'MODULE_POS_CENTER'				=> 'العمود الوسط',
+	'MODULE_POS_BOTTOM'				=> 'الأسفل',
+	'ADD_MODULE'					=> 'إضافة موديل',
+	'CHOOSE_MODULE'					=> 'اختار موديل',
+	'CHOOSE_MODULE_EXP'				=> 'اختار الموديل من القائمة المُنسدلة',
+	'SUCCESS_ADD'					=> 'تم إضافة الموديل بنجاح.',
+	'SUCCESS_DELETE'				=> 'تم حذف الموديل بنجاح.',
+	'NO_MODULES'					=> 'لم يتم الكشف عن أي موديلات.',
+	'MOVE_RIGHT'					=> 'تحريك لليمين',
+	'MOVE_LEFT'						=> 'تحريك لليسار',
+	'B3P_FILE_NOT_FOUND'			=> 'لم يتم العثور على الملف المطلوب',
+	'UNABLE_TO_MOVE'				=> 'لا يُمكن تحريك الموديل إلى العمود الذي حددته.',
+	'UNABLE_TO_MOVE_ROW'			=> 'لا يُمكن تحريك الموديل إلى الصف الذي حددته.',
+	'UNABLE_TO_ADD_MODULE'			=> 'لا يُمكن إضافة الموديل إلى العمود الذي حددته.',
+	'DELETE_MODULE_CONFIRM'			=> 'هل أنت متأكد من حذف الموديل "%1$s" ?',
+	'MODULE_RESET_SUCCESS'			=> 'تم إعادة ضبط إعدادت الموديل.',
+	'MODULE_RESET_CONFIRM'			=> 'هل أنت متأكد من إعادة ضبط إعدادات الموديل "%1$s" ?',
+	'MODULE_NOT_EXISTS'				=> 'الموديل المُحدد غير موجود.',
+
+	'MODULE_OPTIONS'			=> 'خيارات الموديل',
+	'MODULE_NAME'				=> 'الإسم ',
+	'MODULE_NAME_EXP'			=> 'ادخل إسم الموديل الذي يجب عرضه في ضبط الموديل.',
+	'MODULE_IMAGE'				=> 'الصورة ',
+	'MODULE_IMAGE_EXP'			=> 'ادخل إسم صورة الموديل. يجب أن تكون الصور موجودة في المسار styles/{yourstyle}/theme/images/portal/. {yourstyle} يعني إسم مجلد الاستايل الذي تستخدمه.',
+	'MODULE_PERMISSIONS'		=> 'الصلاحيات ',
+	'MODULE_PERMISSIONS_EXP'	=> 'حدد المجموعات التي تستطيع مُشاهدة هذا الموديل. عدم تحديد أي مجموعة يعني عرض هذا الموديل لجميع الأعضاء.<br />تستطيع تحديد أو إلعاء التحديد لأكثر من مجموعة بالنقر باستمرار على زر الكنترول <samp>CTRL</samp> والنقر بنفس الوقت بالماوس على المجموعة المطلوبة.',
+	'MODULE_IMAGE_WIDTH'		=> 'عرض الصورة ',
+	'MODULE_IMAGE_WIDTH_EXP'	=> 'ادخل مقاس العرض لصورة الموديل بالبيكسل',
+	'MODULE_IMAGE_HEIGHT'		=> 'ارتفاع الصورة ',
+	'MODULE_IMAGE_HEIGHT_EXP'	=> 'ادخل مقاس الإرتفاع لصورة الموديل بالبيكسل',
+	'MODULE_RESET'				=> 'إعادة ضبط الإعدادات ',
+	'MODULE_RESET_EXP'			=> 'سوف يتم إعادة ضبط الإعدادات إلى الإفتراضية !',
+	'MODULE_STATUS'				=> 'تفعيل ',
+	'MODULE_ADD_ONCE'			=> 'يُمكن إضافة هذا الموديل مرة واحدة فقط.',
+	'MODULE_IMAGE_ERROR'		=> 'يوجد خطأ أثناء التحقق من صورة الموديل :',
+	'UNKNOWN_MODULE_METHOD'		=> 'لا يُمكن مُعالجة طريقة الموديل %1$s.',
+
+	// general
+	'ACP_PORTAL_CONFIG_INFO'				=> 'إعدادات عامة',
+	'ACP_PORTAL_GENERAL_TITLE'				=> 'إدارة المجلة',
+	'ACP_PORTAL_GENERAL_TITLE_EXP'			=> 'شكراً لإستخدامك مجلة المنتدى Board3 ! من هنا تستطيع إدارة صفحة المجلة. الخيارات الموجود بالأسفل تعطيك إمكانية تخصيص العديد من الإعدادات العامة.',
+	'ACP_PORTAL_SHOW_ALL'					=> 'إظهار المجلة على جميع الصفحات ',
+	'ACP_PORTAL_SHOW_ALL_EXP'				=> 'عرض المجلة على جميع الصفحات',
+	'PORTAL_ENABLE'							=> 'تفعيل ',
+	'PORTAL_ENABLE_EXP'						=> 'تفعيل أو تعطيل المجلة',
+	'PORTAL_LEFT_COLUMN'					=> 'تفعيل العمود اليسار ',
+	'PORTAL_LEFT_COLUMN_EXP'				=> 'عرض العمود اليسار فقط وإخفاء اليمين',
+	'PORTAL_RIGHT_COLUMN'					=> 'تفعيل العمود اليمين ',
+	'PORTAL_RIGHT_COLUMN_EXP'				=> 'عرض العمود اليمين فقط وإخفاء اليسار',
+	'PORTAL_DISPLAY_JUMPBOX'				=> 'إظهار صندوق التنقل السريع ',
+	'PORTAL_DISPLAY_JUMPBOX_EXP'			=> 'عرض صندوق التنقل السريع في المجلة. لن يعمل هذا الخيار إذا تم تعطيل صندوق التنقل السريع في خصائص المنتدى.',
+	'ACP_PORTAL_COLUMN_WIDTH_SETTINGS'		=> 'إعدادات عرض الأعمدة',
+	'PORTAL_LEFT_COLUMN_WIDTH'				=> 'عرض العمود اليسار ',
+	'PORTAL_LEFT_COLUMN_WIDTH_EXP'			=> 'تغيير عرض العمود اليسار بالبيكسل ؛ ننصح بالقيمة 180',
+	'PORTAL_RIGHT_COLUMN_WIDTH'				=> 'عرض العمود اليمين  ',
+	'PORTAL_RIGHT_COLUMN_WIDTH_EXP'			=> 'تغيير عرض العمود اليمين بالبيكسل ؛ ننصح بالقيمة 180',
+	'PORTAL_SHOW_ALL_SIDE'					=> 'اظهار العمود على جميع الصفحات ',
+	'PORTAL_SHOW_ALL_SIDE_EXP'				=> 'اختار أحد الأعمدة لعرضه على جميع الصفحات.',
+	'PORTAL_SHOW_ALL_LEFT'					=> 'يسار',
+	'PORTAL_SHOW_ALL_RIGHT'					=> 'يمين',
+
+	'LINK_ADDED'							=> 'تم إضافة الرابط بنجاح',
+	'LINK_UPDATED'							=> 'تم تحديث الرابط بنجاح',
+
+	// Install
+	'PORTAL_BASIC_INSTALL'			=> 'جاري إضافة الموديلات الأساسية',
+	'PORTAL_BASIC_UNINSTALL'		=> 'جاري حذف الموديلات من قاعدة البيانات',
+));

language/de/modules/portal_donation_module.php

@@ -57,9 +57,11 @@ $lang = array_merge($lang, array(
 	'ILS'						=> 'Neue Israelische Schekel (ILS)',
 
 	// ACP
-	'ACP_PORTAL_PAYPAL_SETTINGS'				=> 'Paypal Einstellungen',
+	'ACP_PORTAL_PAYPAL_SETTINGS'			=> 'Paypal Einstellungen',
 	'ACP_PORTAL_PAYPAL_SETTINGS_EXP'		=> 'Hier kannst du die Paypal Einstellungen ändern.',
-	'PORTAL_PAY_ACC'							=> 'Paypal Account',
+	'PORTAL_PAY_ACC'						=> 'Paypal Account',
 	'PORTAL_PAY_ACC_EXP'					=> 'Gib deine e-mail-Adresse an, die du bei Paypal benutzt, z.B. xxx@xxx.com',
-	'PORTAL_PAY_CUSTOM'				=> 'Benutzername an die Paypal Zahlung anhängen',
+	'PORTAL_PAY_CUSTOM'						=> 'Benutzername an die Paypal Zahlung anhängen',
+	'PORTAL_PAY_DEFAULT'					=> 'Standard-Währung',
+	'PORTAL_PAY_DEFAULT_EXP'				=> 'Währung die standardmäßig in der Drop-Down-Liste ausgewählt ist.'
 ));

language/de/modules/portal_search_module.php

@@ -38,5 +38,5 @@ $lang = array_merge($lang, array(
 	'PORTAL_SEARCH_POSTS'	=> 'Beiträge',
 	'PORTAL_SEARCH_AUTHOR'	=> 'Autor',
 	'PORTAL_SEARCH_ENGINE'	=> 'Suchmaschinen',
-	'PORTAL_SEARCH_ADV'		=> 'erweiterte Suche',
+	'PORTAL_SEARCH_ADV'		=> 'Erweiterte Suche',
 ));

language/de/modules/portal_tl_menu_module.php

@@ -0,0 +1,36 @@
+<?php
+/**
+*
+* @package Board3 Portal v2 - Link Us
+* @copyright (c) Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* 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(
+	'TL_MENU'							=> 'Tipprunde ',
+));

language/de/permissions_portal.php

@@ -0,0 +1,39 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1
+* @copyright (c) 2015 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(
+	// Adding the permissions
+	'ACL_A_MANAGE_PORTAL'		=> 'Kann Portal-Einstellungen ändern',
+	'ACL_U_VIEW_PORTAL'			=> 'Kann das Portal sehen',
+));

language/de/portal_acp.php

@@ -74,62 +74,36 @@ $lang = array_merge($lang, array(
 	'MODULE_STATUS'				=> 'Aktiviere Modul',
 	'MODULE_ADD_ONCE'			=> 'Diese Modul kann nur ein Mal hinzugefügt werden.',
 	'MODULE_IMAGE_ERROR'		=> 'Während dem Prüfen des Modul Bildes sind ein oder mehrere Fehler aufgetreten:',
+	'UNKNOWN_MODULE_METHOD'		=> 'Die Modul Methode des %1$s Moduls konnte nicht gefunden werden.',
 
 	// general
 	'ACP_PORTAL_CONFIG_INFO'				=> 'Allgemeine Einstellungen',
 	'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.',
+	'ACP_PORTAL_SHOW_ALL'					=> 'Zeige portal auf allen Seiten',
+	'ACP_PORTAL_SHOW_ALL_EXP'				=> 'Zeigt das Portal auf allen Seiten des Forums an.',
 	'PORTAL_ENABLE'							=> 'Portal aktivieren',
 	'PORTAL_ENABLE_EXP'						=> 'Wenn deaktiviert, wird das komplette Portal abgeschaltet.',
 	'PORTAL_LEFT_COLUMN'					=> 'Linke Spalte aktivieren',
 	'PORTAL_LEFT_COLUMN_EXP'				=> 'Die Linke Spalte auf dem Portal anzeigen',
 	'PORTAL_RIGHT_COLUMN'					=> 'Rechte Spalte aktivieren',
 	'PORTAL_RIGHT_COLUMN_EXP'				=> 'Die Rechte Spalte auf dem Portal anzeigen',
-	'PORTAL_VERSION_CHECK'					=> 'Versioncheck auf Portal',
 	'ACP_PORTAL_COLUMN_WIDTH_SETTINGS'		=> 'Breiteneinstellung der rechten und linken Spalte',
 	'PORTAL_LEFT_COLUMN_WIDTH'				=> 'Breite der linken Spalte',
 	'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.',
+	'PORTAL_SHOW_ALL_SIDE'					=> 'Spalte die auf allen Seiten angezeigt werden soll',
+	'PORTAL_SHOW_ALL_SIDE_EXP'				=> 'Wähle welche Spalte auf allen seiten des Portals angezeigt werden soll.',
+	'PORTAL_SHOW_ALL_LEFT'					=> 'Links',
+	'PORTAL_SHOW_ALL_RIGHT'					=> 'Rechts',
 
 	'LINK_ADDED'							=> 'Der Link wurde erfolgreich eingetragen',
 	'LINK_UPDATED'							=> 'Der Link wurde erfolgreich geändert',
 
-	// Upload Module
-	'MODULE_UPLOAD'					=> 'Lade ein Modul hoch',
-	'MODULE_UPLOAD_EXP'				=> 'Wähle die ZIP-Datei des Moduls das du hochladen willst:',
-	'MODULE_UPLOAD_GO'				=> 'Hochladen',
-	'NO_MODULE_UPLOAD'				=> 'Deine Server-Konfiguration erlaubt das Hochladen von Dateien nicht.',
-	'NO_FILE_B3P'					=> 'Es wurde keine Zip-Datei ausgewählt.',
-	'MODULE_UPLOADED'				=> 'Modul erfolgreich hochgeladen.',
-	'MODULE_UPLOAD_MKDIR_FAILURE'	=> 'Es konnte kein Ordner erstellt werden.',
-	'MODULE_COPY_FAILURE'			=> 'Die folgende Datei konnte nicht kopiert werden: %1$s',
-	'MODULE_CORRUPTED'				=> 'Das Modul das du hochladen willst, scheint defekt zu sein.',
-	'PORTAL_NEW_FILES'				=> 'Neue Dateien',
-	'PORTAL_MODULE_SOURCE'			=> 'Quelle',
-	'PORTAL_MODULE_TARGET'			=> 'Ziel',
-	'PORTAL_MODULE_STATUS'			=> 'Status',
-	'PORTAL_MODULE_SUCCESS'			=> 'Erfolgreich kopiert.',
-	'PORTAL_MODULE_ERROR'			=> 'Datei exisitert schon oder konnte nicht kopiert werden.',
-
 	// Install
 	'PORTAL_BASIC_INSTALL'			=> 'Füge Basismodule hinzu',
 	'PORTAL_BASIC_UNINSTALL'		=> 'Entferne Module von Datenbank',
-
-	/**
-	* A copy of Handyman` s MOD version check, to view it on the gallery overview
-	*/
-	'ANNOUNCEMENT_TOPIC'	=> 'Release Ankündigung',
-	'CURRENT_VERSION'		=> 'Derzeitige Version',
-	'DOWNLOAD_LATEST'		=> 'Neueste Version herunterladen',
-	'LATEST_VERSION'		=> 'Neueste Version',
-	'NO_INFO'					=> 'Der Server konnte nicht erreicht werden',
-	'NOT_UP_TO_DATE'			=> '%s ist nicht aktuell',
-	'RELEASE_ANNOUNCEMENT'	=> 'Ankündigungsthema',
-	'UP_TO_DATE'			=> '%s ist aktuell',
-	'VERSION_CHECK'			=> 'MOD Version Check',
 ));

language/de_x_sie/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_x_sie/modules/portal_announcements_module.php

@@ -0,0 +1,74 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Announcements
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'LATEST_ANNOUNCEMENTS'			=> 'Letzte Bekanntmachung',
+	'GLOBAL_ANNOUNCEMENTS'			=> 'Global Bekanntmachungen',
+	'GLOBAL_ANNOUNCEMENT'			=> 'Globale Bekanntmachung',
+	'VIEW_LATEST_ANNOUNCEMENT' 		=> '1 Bekanntmachung',
+	'VIEW_LATEST_ANNOUNCEMENTS'	 	=> '%d Bekanntmachungen',
+	'READ_FULL'						=> 'alles lesen',
+	'NO_ANNOUNCEMENTS'				=> 'Keine Bekanntmachung',
+	'POSTED_BY'						=> 'Autor',
+	'COMMENTS'						=> 'Kommentare',
+	'VIEW_COMMENTS'					=> 'Kommentare anzeigen',
+	'PORTAL_POST_REPLY'				=> 'Kommentar schreiben',
+	'TOPIC_VIEWS'					=> 'Zugriffe',
+	'JUMP_NEWEST'					=> 'Zum letzten Beitrag springen',
+	'JUMP_FIRST'					=> 'Zum ersten Beitrag springen',
+	'JUMP_TO_POST'					=> 'Rufe den Beitrag auf',
+
+	// ACP
+	'ACP_PORTAL_ANNOUNCE_SETTINGS'				=> 'Einstellungen für Bekanntmachungen',
+	'ACP_PORTAL_ANNOUNCE_SETTINGS_EXP'			=> 'Hier können Sie die Einstellungen für die Bekanntmachungen ändern.',
+	'PORTAL_ANNOUNCEMENTS'						=> 'Bekanntmachungen anzeigen',
+	'PORTAL_ANNOUNCEMENTS_EXP'					=> 'Diesen Block auf dem Portal anzeigen.',
+	'PORTAL_ANNOUNCEMENTS_STYLE'				=> 'Kompakter Bekanntmachungen-Block-Stil',
+	'PORTAL_ANNOUNCEMENTS_STYLE_EXP'			=> 'Wenn "ja" ausgewählt ist, wird die kompakte Ansicht für die Bekanntmachungen angezeigt, bei "nein" die große Ansicht.',
+	'PORTAL_NUMBER_OF_ANNOUNCEMENTS'			=> 'Anzahl der Bekanntmachungen auf dem Portal',
+	'PORTAL_NUMBER_OF_ANNOUNCEMENTS_EXP'		=> '0 bedeutet unbegrenzt',
+	'PORTAL_ANNOUNCEMENTS_DAY'					=> 'Die Anzahl der Tage, während der die Bekanntmachung angezeigt werden soll',
+	'PORTAL_ANNOUNCEMENTS_DAY_EXP'				=> '0 bedeutet unbegrenzt',
+	'PORTAL_ANNOUNCEMENTS_LENGTH'				=> 'Maximale Länge der Bekanntmachungen',
+	'PORTAL_ANNOUNCEMENTS_LENGTH_EXP'			=> '0 bedeutet unbegrenzt',
+	'PORTAL_GLOBAL_ANNOUNCEMENTS_FORUM'			=> 'Foren der Bekanntmachungen',
+	'PORTAL_GLOBAL_ANNOUNCEMENTS_FORUM_EXP'		=> 'Die ID des Forums, aus welchem die Bekanntmachungen angezeigt werden sollen. Frei lassen, um aus allen Foren anzeigen zu lassen. Falls "Foren ausschließen" auf "Ja" steht, wählen Sie die Foren die Sie ausschließen möchten.<br />Falls "Foren ausschließen" auf "Nein" steht, wählen Sie die Foren die Sie sehen möchten.<br />Wählen Sie mehrere Foren aus/ab, indem Sie beim Klicken die <samp>Strg</samp>-Taste drückst.',
+	'PORTAL_ANNOUNCEMENTS_FORUM_EXCLUDE'		=> 'Foren ausschließen',
+	'PORTAL_ANNOUNCEMENTS_FORUM_EXCLUDE_EXP'	=> 'Wählen Sie "Ja" wenn Sie die ausgewählten Foren vom Bekanntmachungen-Block ausschließen möchten, und "Nein" wenn Sie nur die Bekanntmachungen aus den ausgewählten Foren im Bekanntmachungen-Block sehen möchten.',
+	'PORTAL_ANNOUNCEMENTS_PERMISSIONS'			=> 'Berechtigungen prüfen anschalten?',
+	'PORTAL_ANNOUNCEMENTS_PERMISSIONS_EXP'		=> 'Berücksichtigt Berechtigungen beim Anzeigen der Bekanntmachungen',
+	'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.',
+));

language/de_x_sie/modules/portal_attachments_module.php

@@ -0,0 +1,54 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Attachments
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'DOWNLOADS'				=> 'Downloads',
+	'NO_ATTACHMENTS'		=> 'Keine Dateianhänge',
+	'PORTAL_ATTACHMENTS'	=> 'Dateianhänge-Block',
+
+	// ACP
+	'ACP_PORTAL_ATTACHMENTS_NUMBER_SETTINGS'			=> 'Einstellungen für Dateianhänge',
+	'ACP_PORTAL_ATTACHMENTS_NUMBER_SETTINGS_EXP'		=> 'Hier können Sie die Einstellungen für Dateianhänge ändern.',
+	'PORTAL_ATTACHMENTS_NUMBER'							=> 'Anzahl der anzuzeigenden Dateianhänge',
+	'PORTAL_ATTACHMENTS_NUMBER_EXP'						=> '0 bedeutet unbegrenzt',
+	'PORTAL_ATTACHMENTS_FORUM_IDS'						=> 'Dateianhänge Foren',
+	'PORTAL_ATTACHMENTS_FORUM_IDS_EXP'					=> 'Die Foren, aus welchen die Dateianhänge angezeigt werden sollen. Frei lassen, um aus allen Foren anzeigen zu lassen. Falls "Foren ausschließen" auf "Ja" steht, wählen Sie die Foren die Sie ausschließen möchten.<br />Falls "Foren ausschließen" auf "Nein" steht, wählen Sie die Foren aus, aus denen Sie die Dateianhänge sehen möchten.<br />Wählen Sie mehrere Foren aus/ab, indem Sie beim Klicken die <samp>Strg</samp>-Taste gedrückt halten.',
+	'PORTAL_ATTACHMENTS_FORUM_EXCLUDE'					=> 'Foren ausschließen',
+	'PORTAL_ATTACHMENTS_FORUM_EXCLUDE_EXP'				=> 'Wählen Sie "Ja" wenn Sie die ausgewählten Foren vom Dateianhänge-Block ausschließen möchten, und "Nein" wenn Sie nur die Dateianhänge der ausgewählten Foren im Dateianhänge-Block sehen möchten.',
+	'PORTAL_ATTACHMENTS_MAX_LENGTH'						=> 'Maximal angezeigte Länge der Dateianhänge',
+	'PORTAL_ATTACHMENTS_MAX_LENGTH_EXP'					=> '0 bedeutet unbegrenzt',
+	'PORTAL_ATTACHMENTS_FILETYPE' 						=> 'Dateitypen',
+	'PORTAL_ATTACHMENTS_FILETYPE_EXP' 					=> 'Falls "Dateitypen ausschließen" auf "Ja" steht, wählen Sie die Dateitypen die Sie ausschließen möchten.<br />Falls "Dateitypen ausschließen" auf "Nein" steht, wählen Sie die Dateitypen die Sie sehen möchten.<br />Wählen Sie mehrere Foren aus/ab, indem Sie beim Klicken die <samp>Strg</samp>-Taste gedrückt halten.',
+	'PORTAL_ATTACHMENTS_EXCLUDE'						=> 'Dateitypen ausschließen',
+	'PORTAL_ATTACHMENTS_EXCLUDE_EXP'					=> 'Wählen Sie "Ja" wenn Sie die ausgewählten Dateitypen vom Dateianhänge-Block ausschließen möchten, und "Nein" wenn Sie nur die ausgewählten Dateitypen im Dateianhänge-Block sehen möchten.',
+));

language/de_x_sie/modules/portal_birthday_list_module.php

@@ -0,0 +1,44 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Birthday List
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'BIRTHDAYS_AHEAD'				=> 'In den nächsten %s Tagen',
+	'NO_BIRTHDAYS_AHEAD'			=> 'In diesem Zeitraum hat kein Mitglied Geburtstag',
+
+	// ACP
+	'ACP_PORTAL_BIRTHDAYS_SETTINGS'			=> 'Einstellungen für den Geburtstage-Block',
+	'ACP_PORTAL_BIRTHDAYS_SETTINGS_EXP'		=> 'Hier können Sie 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.',
+));

language/de_x_sie/modules/portal_calendar_module.php

@@ -0,0 +1,131 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Calendar
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_CALENDAR'		=> 'Kalender',
+	'VIEW_NEXT_MONTH'		=> 'nächster Monat',
+	'VIEW_PREVIOUS_MONTH'	=> 'voriger Monat',
+	'EVENT_START'			=> 'Von',
+	'EVENT_END'				=> 'Bis',
+	'EVENT_TIME'			=> 'Zeit',
+	'EVENT_ALL_DAY'			=> 'Ganztägig',
+	'CURRENT_EVENTS'		=> 'Aktuelle Veranstaltungen',
+	'NO_CUR_EVENTS'			=> 'Keine aktuellen Veranstaltungen',
+	'UPCOMING_EVENTS'		=> 'Bevorstehende Veranstaltungen',
+	'NO_UPCOMING_EVENTS'	=> 'Keine bevorstehenden Veranstaltungen',
+
+	'mini_cal'	=> array(
+		'day'	=> array(
+			'1'	=> 'So',
+			'2'	=> 'Mo',
+			'3'	=> 'Di',
+			'4'	=> 'Mi',
+			'5'	=> 'Do',
+			'6'	=> 'Fr',
+			'7'	=> 'Sa',
+		),
+
+		'month'	=> array(
+			'1'	=> 'Jan.',
+			'2'	=> 'Feb.',
+			'3'	=> 'Mär.',
+			'4'	=> 'Apr.',
+			'5'	=> 'Mai',
+			'6'	=> 'Jun.',
+			'7'	=> 'Jul.',
+			'8'	=> 'Aug.',
+			'9'	=> 'Sep.',
+			'10'=> 'Okt.',
+			'11'=> 'Nov.',
+			'12'=> 'Dez.',
+		),
+
+		'long_month'=> array(
+			'1'	=> 'Januar',
+			'2'	=> 'Februar',
+			'3'	=> 'März',
+			'4'	=> 'April',
+			'5'	=> 'Mai',
+			'6'	=> 'Juni',
+			'7'	=> 'Juli',
+			'8'	=> 'August',
+			'9'	=> 'September',
+			'10'=> 'Oktober',
+			'11'=> 'November',
+			'12'=> 'Dezember',
+		),
+	),
+
+	// ACP
+	'ACP_PORTAL_CALENDAR'					=> 'Kalender Einstellungen',
+	'ACP_PORTAL_CALENDAR_EXP'				=> 'Hier können Sie die Einstellungen für den Kalender ändern.',
+	'ACP_PORTAL_EVENTS'						=> 'Kalender Veranstaltungen',
+	'PORTAL_CALENDAR_TODAY_COLOR'			=> 'Farbe für den aktuellen Tag',
+	'PORTAL_CALENDAR_TODAY_COLOR_EXP'		=> 'HEX oder Farbennamen sind erlaubt (Englisch!) wie z.B. #FFFFFF für Weiß oder (englische!) Farbennamen wie z.B. violet.',
+	'PORTAL_CALENDAR_SUNDAY_COLOR'			=> 'Farbe für Sonntage',
+	'PORTAL_CALENDAR_SUNDAY_COLOR_EXP'		=> 'HEX oder Farbennamen sind erlaubt (Englisch!) wie z.B. #FFFFFF für Weiß oder (englische!) Farbennamen wie z.B. violet.',
+	'PORTAL_LONG_MONTH'						=> 'Langen Monatsname anzeigen',
+	'PORTAL_LONG_MONTH_EXP'					=> 'Wenn deaktiviert, wird der Monat gekürzt z.B. Aug. statt August.',
+	'PORTAL_SUNDAY_FIRST'					=> 'Erster Tag der Woche',
+	'PORTAL_SUNDAY_FIRST_EXP'				=> 'Wenn deaktiviert, wird von Mo. --> So. angezeigt, ansonsten So. --> Sa.',
+	'PORTAL_DISPLAY_EVENTS'					=> 'Veranstaltungen anzeigen',
+	'PORTAL_DISPLAY_EVENTS_EXP'				=> 'Zeige Veranstaltungen an, die im Kalender Block erstellt wurden.',
+	'PORTAL_EVENTS_MANAGE'					=> 'Veranstaltungen verwalten',
+	'NO_EVENT_TITLE'						=> 'Sie haben keinen Titel für die Veranstaltung angegeben.',
+	'NO_EVENT_START'						=> 'Sie haben keine Start-Zeit für die Veranstaltung angegeben.',
+	'ADD_EVENT'								=> 'Veranstaltung hinzufügen',
+	'EVENT_UPDATED'							=> 'Veranstaltung erfolgreich aktualisiert.',
+	'EVENT_ADDED'							=> 'Veranstaltung erfolgreich hinzugefügt.',
+	'NO_EVENT'								=> 'Keine Veranstaltung.',
+	'EVENT_TITLE'							=> 'Titel der Veranstaltung',
+	'EVENT_DESC'							=> 'Beschreibung',
+	'EVENT_LINK'							=> 'Link zur Veranstaltung',
+	'EVENT_LINK_EXP'						=> 'Geben Sie hier den Link zu einem Thema oder einer Website mit der Ankündigung oder dem Diskussionsthema der Veranstaltung ein.',
+	'NO_EVENTS'								=> 'Keine Veranstaltungen',
+	'ACP_PORTAL_CALENDAR_START_INCORRECT'	=> 'Die eingegebene Start-Zeit ist nicht korrekt. Bitte folgen Sie genau den Anweisungen.',
+	'ACP_PORTAL_CALENDAR_END_INCORRECT'		=> 'Die eingegebene End-Zeit ist nicht korrekt. Bitte folgen Sie genau den Anweisungen.',
+	'ACP_PORTAL_CALENDAR_EVENT_PAST'		=> 'Die Start-zeit der Veranstaltung muss in der Zukunft liegen.',
+	'ACP_PORTAL_EVENT_START_DATE'			=> 'Start-Datum der Veranstaltung',
+	'ACP_PORTAL_EVENT_START_DATE_EXP'		=> 'Geben Sie 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_END_DATE'				=> 'End-Datum der Veranstaltung',
+	'ACP_PORTAL_EVENT_END_DATE_EXP'			=> 'Geben Sie das Datum und Uhrzeit ein, zu der die Veranstaltung endet. Datum und Uhrzeit sollten in einem ähnlichen Format sein: TT.MM.JJJJ',
+	'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ählen Sie die Gruppen aus, denen es erlaubt sein soll die Veranstaltung zu sehen. Falls alle Benutzer die Veranstaltung sehen sollen, dann wählen Sie nichts aus.<br />Wählen Sie mehrere Gruppen aus/ab, indem Sie beim Klicken die <samp>Strg</samp>-Taste gedrückt halten.',
+	'PORTAL_EVENTS_URL_NEW_WINDOW'			=> 'Öffne externe Veranstaltungsverknüpfungen in einem neuen Fenster',
+
+	// Logs
+	'LOG_PORTAL_EVENT_UPDATED'				=> '<strong>Veranstaltung aktualisiert</strong><br />&raquo; %s',
+	'LOG_PORTAL_EVENT_ADDED'				=> '<strong>Veranstaltung hinzugefügt</strong><br />&raquo; %s',
+	'LOG_PORTAL_EVENT_REMOVED'				=> '<strong>Veranstaltung entfernt</strong><br />&raquo; %s',
+));

language/de_x_sie/modules/portal_clock_module.php

@@ -0,0 +1,42 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Clock
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'CLOCK'		=> 'Uhr',
+
+	// ACP
+	'ACP_PORTAL_CLOCK_SETTINGS'		=> 'Uhr Einstellungen',
+	'ACP_PORTAL_CLOCK_SETTINGS_EXP'	=> 'Hier können Sie die Einstellungen für die Uhr ändern',
+	'ACP_PORTAL_CLOCK_SRC'			=> 'Uhr',
+	'ACP_PORTAL_CLOCK_SRC_EXP'		=> 'Geben Sie den Dateinamen der Uhr  ein. Die Uhr muss unter folgendem Pfad gespeichert sein: styles/*yourstyle*/theme/images/portal/.',
+));

language/de_x_sie/modules/portal_custom_module.php

@@ -0,0 +1,48 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Custom
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_CUSTOM'		=> 'Eigener Block',
+
+	// ACP
+	'ACP_PORTAL_CUSTOM_SETTINGS'			=> 'Custom Block Settings',
+	'ACP_PORTAL_CUSTOM_SETTINGS_EXP'		=> 'Einstellungen für den eigenen Block',
+	'ACP_PORTAL_CUSTOM_CODE_SHORT'			=> 'Der eingegebene Code ist nicht lang genug.',
+	'ACP_PORTAL_CUSTOM_PREVIEW'				=> 'Vorschau',
+	'ACP_PORTAL_CUSTOM_CODE'				=> 'Code für den eigenen Block',
+	'ACP_PORTAL_CUSTOM_CODE_EXP'			=> 'Änderen Sie den Code für Ihre eigenen Block (HTML oder BBCode).',
+	'ACP_PORTAL_CUSTOM_PERMISSION'			=> 'Berechtigungen für den eigenen Block',
+	'ACP_PORTAL_CUSTOM_PERMISSION_EXP'		=> 'Wählen Sie die Gruppen aus, die den eigenen Block sehen dürfen. <br />Wählen Sie mehrere Gruppen aus/ab, indem Sie beim Klicken die <samp>Strg</samp>-Taste gedrückt halten.',
+	'ACP_PORTAL_CUSTOM_BBCODE'				=> 'BBCode für den eigenen Block aktivieren',
+	'ACP_PORTAL_CUSTOM_BBCODE_EXP'			=> 'BBCode kann dann in diesem Block benutzt werden. Ansonsten wird HTML direkt geparst.',
+));

language/de_x_sie/modules/portal_donation_module.php

@@ -0,0 +1,67 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Donation
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'DONATION' 					=> 'PayPal-Spenden',
+	'DONATION_TEXT'				=> 'ist eine Webseite ohne jedes Gewinninteresse. Jeder der dieses Projekt unterstützen möchte, kann dies mit einer kleinen PayPal-Spende tun, damit die Rechnungen für den Server, die Domain, etc. bezahlt werden können.',
+	'PAY_MSG'					=> 'Betrag bitte mit Punkt statt Komma trennen, z.B. 3.50',
+	'PAY_ITEM' 					=> 'Freiwillige Foren-Spende',
+
+	'AUD'						=> 'Australische Dollar (AUD)',
+	'CAD'						=> 'Kanadische Dollar (CAD)',
+	'CZK'						=> 'Tschechische Kronen (CZK)',
+	'DKK'						=> 'Dänische Kronen (DKK)',
+	'HKD'						=> 'Hongkong-Dollar (HKD)',
+	'HUF'						=> 'Ungarische Forint (HUF)',
+	'NZD'						=> 'Neuseeland-Dollar (NZD)',
+	'NOK'						=> 'Norwegische Kronen (NOK)',
+	'PLN'						=> 'Polnische Zloty (PLN)',
+	'GBP'						=> 'Britische Pfund (GBP)',
+	'SGD'						=> 'Singapur-Dollar (SGD)',
+	'SEK'						=> 'Schwedische Kronen (SEK)',
+	'CHF'						=> 'Schweizer Franken (CHF)',
+	'JPY'						=> 'Japanische Yen (JPY)',
+	'USD'						=> 'US-Dollar (USD)',
+	'EUR'						=> 'Euro (EUR)',
+	'MXN'						=> 'Mexikanische Pesos (MXN)',
+	'ILS'						=> 'Neue Israelische Schekel (ILS)',
+
+	// ACP
+	'ACP_PORTAL_PAYPAL_SETTINGS'			=> 'Paypal Einstellungen',
+	'ACP_PORTAL_PAYPAL_SETTINGS_EXP'		=> 'Hier können Sie die Paypal Einstellungen ändern.',
+	'PORTAL_PAY_ACC'						=> 'Paypal Account',
+	'PORTAL_PAY_ACC_EXP'					=> 'Geben Sie Ihre e-mail-Adresse an, die Sie bei Paypal benutzen, z.B. xxx@xxx.com',
+	'PORTAL_PAY_CUSTOM'						=> 'Benutzername an die Paypal Zahlung anhängen',
+	'PORTAL_PAY_DEFAULT'					=> 'Standard-Währung',
+	'PORTAL_PAY_DEFAULT_EXP'				=> 'Währung die standardmäßig in der Drop-Down-Liste ausgewählt ist.'
+));

language/de_x_sie/modules/portal_forumlist_module.php

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

language/de_x_sie/modules/portal_friends_module.php

@@ -0,0 +1,47 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Friends
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'FRIENDS'							=> 'Freunde',
+	'FRIENDS_OFFLINE'					=> 'Offline',
+	'FRIENDS_ONLINE'					=> 'Online',
+	'NO_FRIENDS'						=> 'Derzeit sind keine Freunde definiert',
+	'NO_FRIENDS_OFFLINE'				=> 'Keine Freunde offline',
+	'NO_FRIENDS_ONLINE'					=> 'Keine Freunde online',
+
+	// ACP
+	'ACP_PORTAL_FRIENDS_SETTINGS'				=> 'Einstellungen für den Freunde-Block',
+	'ACP_PORTAL_FRIENDS_SETTINGS_EXP'			=> 'Hier können Sie die Einstellungen für den Freunde-Block ändern.',
+	'PORTAL_MAX_ONLINE_FRIENDS'					=> 'Limitierung der Anzeige Freunde online',
+	'PORTAL_MAX_ONLINE_FRIENDS_EXP'				=> 'Limitiert die Anzeige Freunde online auf den angegebenen Wert.',
+));

language/de_x_sie/modules/portal_latest_bots_module.php

@@ -0,0 +1,43 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Latest Bots
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'LATEST_BOTS'			=> 'Letzte Bots',
+	'LAST_VISITED_BOTS'		=> 'Die letzten Bots',
+
+	// ACP
+	'ACP_PORTAL_BOTS_SETTINGS'					=> 'Einstellungen für Bot-Besuche',
+	'ACP_PORTAL_BOTS_SETTINGS_EXP'				=> 'Hier können Sie die Einstellungen für Bot-Besuche ändern.',
+	'PORTAL_LAST_VISITED_BOTS_NUMBER'			=> 'Anzahl der anzuzeigenden Bots',
+	'PORTAL_LAST_VISITED_BOTS_NUMBER_EXP'		=> '0 bedeutet unbegrenzt',
+));

language/de_x_sie/modules/portal_latest_members_module.php

@@ -0,0 +1,42 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Latest Members
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'LATEST_MEMBERS'				=> 'Neue Mitglieder',
+
+	// ACP
+	'ACP_PORTAL_MEMBERS_SETTINGS'				=> 'Einstellungen für neue Mitglieder',
+	'ACP_PORTAL_MEMBERS_SETTINGS_EXP'			=> 'Hier können Sie die Einstellungen für neue Mitglieder ändern.',
+	'PORTAL_MAX_LAST_MEMBER'					=> 'Anzahl der anzuzeigenden Mitglieder',
+	'PORTAL_MAX_LAST_MEMBER_EXP'				=> '0 bedeutet unbegrenzt',
+));

language/de_x_sie/modules/portal_leaders_module.php

@@ -0,0 +1,45 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Leaders
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'NO_ADMINISTRATORS_P'	=> 'Keine Administratoren',
+	'NO_MODERATORS_P'		=> 'Keine Moderatoren',
+	'NO_GROUPS_P'			=> 'Keine Gruppen',
+	'ACP_PORTAL_LEADERS'	=> 'Das Team',
+
+	// ACP
+	'ACP_PORTAL_LEADERS'		=> 'Team Block Einstellungen',
+	'ACP_PORTAL_LEADERS_EXP'	=> 'Hier können Sie den Team-Block anpassen',
+	'PORTAL_LEADERS_EXT'		=> 'Erweiterter Team-Block',
+	'PORTAL_LEADERS_EXT_EXP'	=> 'Der standard Block listet alle Admins und Moderatoren auf, der erweiterte Team-Block listet zusätzlich alle nicht-versteckten Gruppen inklusive Legende auf.',
+));

language/de_x_sie/modules/portal_link_us_module.php

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

language/de_x_sie/modules/portal_links_module.php

@@ -0,0 +1,56 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Links
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_LINKS'		=> 'Links',
+	'LINKS_NO_LINKS'	=> 'Keine Links vorhanden',
+
+	// ACP
+	'ACP_PORTAL_LINKS'				=> 'Links-Einstellungen',
+	'ACP_PORTAL_LINKS_EXP'			=> 'Einstellungen für die Links ändern.',
+	'ACP_PORTAL_LINK_TITLE'			=> 'Titel',
+	'ACP_PORTAL_LINK_TYPE'			=> 'Link Typ',
+	'ACP_PORTAL_LINK_TYPE_EXP'		=> 'Falls Ihr Link auf Ihr Forum verweist, dann wählen Sie bitte "Interner Link" um ungewollte Logouts zu verhindern.',
+	'ACP_PORTAL_LINK_INT'			=> 'Interner Link',
+	'ACP_PORTAL_LINK_EXT'			=> 'Externer Link',
+	'ACP_PORTAL_LINK_ADD'			=> 'Link erstellen',
+	'ACP_PORTAL_LINK_URL'			=> 'Link URL',
+	'ACP_PORTAL_LINK_URL_EXP'		=> 'Externe Links:<br />Alle Links sollten mit einem http:// eingegeben werden.<br /><br />Interne Links:<br />Geben Sie nur die PHP Datei als Link URL ein, z.B. index.php?style=4.',
+	'ACP_PORTAL_LINK_PERMISSION'	=> 'Link Berechtigungen',
+	'ACP_PORTAL_LINK_PERMISSION_EXP'=> 'Wählen Sie die Gruppen aus die berechtigt sein sollen den Link zu sehen. Falls alle Benutzer den Link sehen sollen, dann wählen Sie nichts aus.<br />Wählen Sie mehrere Gruppen aus/ab indem Sie <samp>STRG</samp> gedrückt halten und klicken.',
+	'ACP_PORTAL_LINKS_NEW_WINDOW'	=> 'Öffne externe Verknüpfungen in einem neuen Fenster',
+
+	// Errors
+	'NO_LINK_TITLE'					=> 'Sie müssen einen Titel für diesen Link angeben.',
+	'NO_LINK_URL'					=> 'Sie müssen eine Link URL eingeben.',
+));

language/de_x_sie/modules/portal_main_menu_module.php

@@ -0,0 +1,69 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Main Menu
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'M_MENU' 						=> 'Menü',
+	'M_CONTENT'						=> 'Inhalt',
+	'M_ACP'							=> 'Administrations-Bereich',
+	'M_HELP'						=> 'Hilfe',
+	'M_BBCODE'						=> 'BBCode-Anleitung',
+	'M_TERMS'						=> 'Nutzungsbedingungen',
+	'M_PRV'							=> 'Datenschutzrichtlinie',
+	'M_SEARCH'						=> 'Suche',
+	'MENU_NO_LINKS'					=> 'Keine Links',
+
+	// ACP
+	'ACP_PORTAL_MENU'				=> 'Hauptmenü-Einstellungen',
+	'ACP_PORTAL_MENU_LINK_SETTINGS'	=> 'Link Einstellungen',
+	'ACP_PORTAL_MENU_EXP'			=> 'Verwalte dein Hauptmenü',
+	'ACP_PORTAL_MENU_MANAGE'		=> 'Hauptmenü-Verwaltung',
+	'ACP_PORTAL_MENU_MANAGE_EXP'	=> 'Sie können die Links Ihres Hauptmenüs hier verwalten.',
+	'ACP_PORTAL_MENU_CAT'			=> 'Kategorie',
+	'ACP_PORTAL_MENU_IS_CAT'		=> 'Setze Link als Kategorie',
+	'ACP_PORTAL_MENU_INT'			=> 'Interner Link',
+	'ACP_PORTAL_MENU_EXT'			=> 'Externer Link',
+	'ACP_PORTAL_MENU_TITLE'			=> 'Titel',
+	'ACP_PORTAL_MENU_URL'			=> 'Link URL',
+	'ACP_PORTAL_MENU_ADD'			=> 'Link erstellen',
+	'ACP_PORTAL_MENU_TYPE'			=> 'Link Typ',
+	'ACP_PORTAL_MENU_TYPE_EXP'		=> 'Falls Ihr Link auf Ihe Forum verweist, dann wählen Sie bitte "Interner Link" um ungewollte Logouts zu verhindern.',
+	'ACP_PORTAL_MENU_CREATE_CAT'	=> 'Sie müssen zuerst eine Kategorie erstellen.',
+	'ACP_PORTAL_MENU_URL_EXP'		=> 'Externe Links:<br />Alle Links sollten mit einem http:// eingegeben werden.<br /><br />Interne Links:<br />Gebe nur die PHP Datei als Link URL ein, z.B. index.php?style=4.',
+	'ACP_PORTAL_MENU_PERMISSION'	=> 'Link Berechtigungen',
+	'ACP_PORTAL_MENU_PERMISSION_EXP'=> 'Wählen Sie die Gruppen aus die berechtigt sein sollen den Link zu sehen. Falls alle Benutzer den Link sehen sollen, dann wählen Sie nichts aus.<br />Wählen Sie mehrere Gruppen aus/ab indem Sie <samp>STRG</samp> gedrückt halten und klicken.',
+	'ACP_PORTAL_MENU_EXT_NEW_WINDOW'=> 'Öffne externe Verknüpfungen in einem neuen Fenster',
+
+	// Errors
+	'NO_LINK_TITLE'					=> 'Sie müssen einen Titel für diesen Link angeben.',
+	'NO_LINK_URL'					=> 'Sie müssen eine Link URL eingeben.',
+));

language/de_x_sie/modules/portal_news_module.php

@@ -0,0 +1,70 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - News
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'LATEST_NEWS'			=> 'Aktuelle Beiträge',
+	'READ_FULL'				=> 'alles lesen',
+	'NO_NEWS'				=> 'Keine neuen Beiträge',
+	'POSTED_BY'				=> 'Autor',
+	'COMMENTS'				=> 'Kommentare',
+	'VIEW_COMMENTS'			=> 'Kommentare anzeigen',
+	'PORTAL_POST_REPLY'		=> 'Kommentar schreiben',
+	'TOPIC_VIEWS'			=> 'Zugriffe',
+	'JUMP_NEWEST'			=> 'Zum letzten Beitrag springen',
+	'JUMP_FIRST'			=> 'Zum ersten Beitrag springen',
+	'JUMP_TO_POST'			=> 'Rufe den Beitrag auf',
+
+	// ACP
+	'ACP_PORTAL_NEWS_SETTINGS'				=> 'Aktuelle Beiträge  Einstellungen',
+	'ACP_PORTAL_NEWS_SETTINGS_EXP'			=> 'Hier können Sie die Einstellungen für die aktuellen Beiträge ändern.',
+	'PORTAL_NEWS_STYLE'						=> 'Kompakter Block-Stil',
+	'PORTAL_NEWS_STYLE_EXP'					=> 'Wenn "ja" ausgewählt ist, wird die kompakte Ansicht für die aktuellen Beiträge angezeigt, bei "nein" die Textansicht.',
+	'PORTAL_SHOW_ALL_NEWS'					=> 'Zeige alle Beiträge dieses Forums',
+	'PORTAL_SHOW_ALL_NEWS_EXP'				=> 'Auch Wichtige Beiträge.',
+	'PORTAL_NUMBER_OF_NEWS'					=> 'Anzahl der Beiträge auf dem Portal',
+	'PORTAL_NUMBER_OF_NEWS_EXP'				=> '0 bedeutet unbegrenzt',
+	'PORTAL_NEWS_LENGTH'					=> 'Maximal angezeigte Länge der Beiträge',
+	'PORTAL_NEWS_LENGTH_EXP'				=> '0 bedeutet unbegrenzt',
+	'PORTAL_NEWS_FORUM'						=> 'Beiträge Foren',
+	'PORTAL_NEWS_FORUM_EXP'					=> 'Die Foren, aus welchen die Beiträge angezeigt werden sollen. Frei lassen, um aus allen Foren anzeigen zu lassen. Falls "Foren ausschließen" auf "Ja" steht, wählen Sie die Foren die Sie ausschließen möchten.<br />Falls "Foren ausschließen" auf "Nein" steht, wählen Sie die Foren die Sie sehen möchten.<br />Wählen Sie mehrere Foren aus/ab, indem Sie beim Klicken die <samp>Strg</samp>-Taste gedrückt halten.',
+	'PORTAL_NEWS_EXCLUDE'					=> 'Foren ausschließen',
+	'PORTAL_NEWS_EXCLUDE_EXP'				=> 'Wählen Sie "Ja" wenn Sie die ausgewählten Foren vom Aktuelle Beiträge-Block ausschließen möchten, und "Nein" wenn Sie nur die Beiträge aus den ausgewählten Foren im Aktuelle Beiträge-Block sehen möchten.',
+	'PORTAL_NEWS_PERMISSIONS'				=> 'Berechtigungen prüfen anschalten?',
+	'PORTAL_NEWS_PERMISSIONS_EXP'			=> 'Berücksichtigt Berechtigungen beim Anzeigen der aktuellen Beiträge',
+	'PORTAL_NEWS_SHOW_LAST'					=> 'Nach neuesten Beiträgen sortieren',
+	'PORTAL_NEWS_SHOW_LAST_EXP'				=> 'Wenn aktiviert, wird nach den neuesten Beiträgen sortiert. Wenn deaktiviert, wird nach den neuesten Themen sortiert.',
+	'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.',
+));

language/de_x_sie/modules/portal_poll_module.php

@@ -0,0 +1,53 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Poll
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_POLL'			=> 'Umfrage',
+	'LATEST_POLLS'			=> 'Neueste Umfragen',
+	'NO_OPTIONS'			=> 'Diese Umfrage verfügt über keine Optionen.',
+	'NO_POLL'				=> 'Derzeit gibt es keine aktuellen Umfragen',
+	'RETURN_PORTAL'			=> '%sZurück zum Portal%s',
+
+	// ACP
+	'ACP_PORTAL_POLLS_SETTINGS'				=> 'Einstellungen für Umfragen',
+	'ACP_PORTAL_POLLS_SETTINGS_EXP'			=> 'Hier können Sie die Einstellungen für Umfragen ändern.',
+	'PORTAL_POLL_TOPIC_ID'					=> 'Umfragen Foren',
+	'PORTAL_POLL_TOPIC_ID_EXP'				=> 'Die Foren, aus welchen die Umfragen angezeigt werden sollen. Frei lassen, um aus allen Foren anzeigen zu lassen. Falls "Foren ausschließen" auf "Ja" steht, wählen Sie die Foren die Sie ausschließen möchten.<br />Falls "Foren ausschließen" auf "Nein" steht, wählen Sie die Foren die Sie sehen möchten.<br />Wählen Sie mehrere Foren aus/ab, indem Sie beim Klicken die <samp>Strg</samp>-Taste gedrückt halten.',
+	'PORTAL_POLL_EXCLUDE_ID'				=> 'Foren ausschließen',
+	'PORTAL_POLL_EXCLUDE_ID_EXP'			=> 'Wählen Sie "Ja" wenn Sie die ausgewählten Foren vom Umfragen-Block ausschließen möchten, und "Nein" wenn Sie nur die Themen aus den ausgewählten Foren im Umfragen-Block sehen möchten.',
+	'PORTAL_POLL_LIMIT'						=> 'Maximale Anzahl der Umfragen',
+	'PORTAL_POLL_LIMIT_EXP'					=> 'Die Anzahl der Umfragen, die auf dem Portal angezeigt werden sollen.',
+	'PORTAL_POLL_ALLOW_VOTE'				=> 'Abstimmen erlauben',
+	'PORTAL_POLL_ALLOW_VOTE_EXP'			=> 'Verfügt der Benutzer über entsprechende Berechtigungen, kann er direkt auf der Portal-Seite abstimmen.',
+	'PORTAL_POLL_HIDE'						=> 'Abgelaufene Umfragen verbergen?',
+));

language/de_x_sie/modules/portal_random_member_module.php

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

language/de_x_sie/modules/portal_recent_module.php

@@ -0,0 +1,51 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Recent Module
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_RECENT'				=> 'Aktuelles',
+	'PORTAL_RECENT_TOPIC'		=> 'Aktuelle Themen',
+	'PORTAL_RECENT_ANN'			=> 'Aktuelle Bekanntmachungen',
+	'PORTAL_RECENT_HOT_TOPIC'	=> 'Beliebte Themen',
+
+	// ACP
+	'ACP_PORTAL_RECENT_SETTINGS'				=> 'Einstellungen für neueste Themen',
+	'ACP_PORTAL_RECENT_SETTINGS_EXP'			=> 'Hier können Sie die Einstellungen für die neuesten Themen ändern.',
+	'PORTAL_MAX_TOPIC'							=> 'Anzahl der neuesten Themen auf dem Portal',
+	'PORTAL_MAX_TOPIC_EXP'						=> '0 bedeutet unbegrenzt',
+	'PORTAL_RECENT_TITLE_LIMIT'					=> 'Maximal angezeigte Länge der neuesten Themen',
+	'PORTAL_RECENT_TITLE_LIMIT_EXP'				=> '0 bedeutet unbegrenzt',
+	'PORTAL_RECENT_FORUM'						=> 'Themen Foren',
+	'PORTAL_RECENT_FORUM_EXP'					=> 'Die Foren, aus welchen die Themen angezeigt werden sollen. Frei lassen, um aus allen Foren anzeigen zu lassen. Falls "Foren ausschließen" auf "Ja" steht, wählen Sie die Foren die Sie ausschließen möchten.<br />Falls "Foren ausschließen" auf "Nein" steht, wählen Sie die Foren die Sie sehen möchten.<br />Wählen Sie mehrere Foren aus/ab, indem Sie beim Klicken die <samp>Strg</samp>-Taste gedrückt halten.',
+	'PORTAL_EXCLUDE_FORUM'						=> 'Foren ausschließen',
+	'PORTAL_EXCLUDE_FORUM_EXP'					=> 'Wählen Sie "Ja" wenn Sie die ausgewählten Foren vom Aktuelle Themen-Block ausschließen möchten, und "Nein" wenn Sie nur die Themen aus den ausgewählten Foren im Aktuelle Themen-Block sehen möchten.',
+));

language/de_x_sie/modules/portal_search_module.php

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

language/de_x_sie/modules/portal_statistics_module.php

@@ -0,0 +1,51 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Statistics
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'ST_TOP'					=> 'Insgesamt',
+	'ST_TOP_ANNS'				=> 'Bekanntmachungen insgesamt:',
+	'ST_TOP_STICKYS'			=> 'Wichtig insgesamt:',
+	'ST_TOT_ATTACH'				=> 'Dateianhänge insgesamt:',
+	'TOPICS_PER_DAY_OTHER'		=> 'Themen pro Tag: <strong>%d</strong>',
+	'TOPICS_PER_DAY_ZERO'		=> 'Themen pro Tag: <strong>0</strong>',
+	'POSTS_PER_DAY_OTHER'		=> 'Beiträge pro Tag: <strong>%d</strong>',
+	'POSTS_PER_DAY_ZERO'		=> 'Beiträge pro Tag: <strong>0</strong>',
+	'USERS_PER_DAY_OTHER'		=> 'Benutzer pro Tag: <strong>%d</strong>',
+	'USERS_PER_DAY_ZERO'		=> 'Benutzer pro Tag: <strong>0</strong>',
+	'TOPICS_PER_USER_OTHER'		=> 'Themen pro Benutzer: <strong>%d</strong>',
+	'TOPICS_PER_USER_ZERO'		=> 'Themen pro Benutzer: <strong>0</strong>',
+	'POSTS_PER_USER_OTHER'		=> 'Beiträge pro Benutzer: <strong>%d</strong>',
+	'POSTS_PER_USER_ZERO'		=> 'Beiträge pro Benutzer: <strong>0</strong>',
+	'POSTS_PER_TOPIC_OTHER'		=> 'Beiträge pro Thema: <strong>%d</strong>',
+	'POSTS_PER_TOPIC_ZERO'		=> 'Beiträge pro Thema: <strong>0</strong>',
+));

language/de_x_sie/modules/portal_stylechanger_module.php

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

language/de_x_sie/modules/portal_topposters_module.php

@@ -0,0 +1,41 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Topposters
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'TOPPOSTERS'					=> 'Top Poster',
+	'TOPPOSTERS_CONFIG'				=> 'Einstellungen zu Top Poster',
+
+	// ACP
+	'NUM_TOPPOSTERS'				=> 'Anzahl der Top Poster',
+	'NUM_TOPPOSTERS_EXP'			=> 'Geben Sie die Anzahl der Benutzer an, die im Top Poster Block angezeigt werden sollen.',
+));

language/de_x_sie/modules/portal_user_menu_module.php

@@ -0,0 +1,45 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - User Menu
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'USER_MENU'					=> 'Benutzer-Menü',
+	'UM_LOG_ME_IN'				=> 'Mich bei jedem Besuch automatisch anmelden',
+	'UM_HIDE_ME'				=> 'Meinen Online-Status während dieser Sitzung verbergen',
+	'UM_REGISTER_NOW'			=> 'Registriern Sie sich jetzt!',
+	'UM_MAIN_SUBSCRIBED'		=> 'Benachrichtigungen verwalten',
+	'UM_BOOKMARKS'				=> 'Lesezeichen verwalten',
+	'M_MENU' 					=> 'Menü',
+	'M_ACP'						=> 'Administrations-Bereich',
+	'USER_MENU_SETTINGS'		=> 'Benutzer-Menü Einstellungen',
+	'USER_MENU_REGISTER'		=> 'Zeige Registrierungs-Link in Benutzer-Menü',
+));

language/de_x_sie/modules/portal_welcome_module.php

@@ -0,0 +1,43 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1 - Welcome
+* @copyright (c) 2013 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_WELCOME'		=> 'Willkommen',
+
+	// ACP
+	'ACP_PORTAL_WELCOME_SETTINGS'			=> 'Einstellungen für die Willkommens-Nachricht',
+	'ACP_PORTAL_WELCOME_MESSAGE_SHORT'		=> 'Die eingegebene Nachricht ist nicht lang genug.',
+	'ACP_PORTAL_WELCOME_PREVIEW'			=> 'Willkommens-Nachricht Vorschau',
+	'ACP_PORTAL_WELCOME_MESSAGE'			=> 'Willkommens-Nachricht',
+	'ACP_PORTAL_WELCOME_MESSAGE_EXP'		=> 'Sie können die Willkommens-Nachricht in der Textbox verändern. BBCode, Bilder und Links sind erlaubt.',
+));

language/de_x_sie/modules/portal_whois_online_module.php

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

language/de_x_sie/permissions_portal.php

@@ -0,0 +1,39 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1
+* @copyright (c) 2015 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(
+	// Adding the permissions
+	'ACL_A_MANAGE_PORTAL'		=> 'Kann Portal-Einstellungen ändern',
+	'ACL_U_VIEW_PORTAL'			=> 'Kann das Portal sehen',
+));

language/de_x_sie/portal.php

@@ -0,0 +1,40 @@
+<?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
+
+// Common
+$lang = array_merge($lang, array(
+	'PORTAL'			=> 'Portal',
+	'VIEWING_PORTAL'	=> 'Betrachtet das Portal',
+	'BACK'				=> 'Zurück',
+));

language/de_x_sie/portal_acp.php

@@ -0,0 +1,109 @@
+<?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
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+
+
+$lang = array_merge($lang, array(
+	// Portal Module
+	'ACP_PORTAL_MODULES_EXP'		=> 'Sie können Ihre Portal Module hier verwalten. Falls Sie alle Module deaktivieren, dann deaktivieren Sie bitte auch das Portal.',
+
+	'MODULE_POS_TOP'				=> 'Oben',
+	'MODULE_POS_LEFT'				=> 'Linke Spalte',
+	'MODULE_POS_RIGHT'				=> 'Rechte Spalte',
+	'MODULE_POS_CENTER'				=> 'Mittlere Spalte',
+	'MODULE_POS_BOTTOM'				=> 'Unten',
+	'ADD_MODULE'					=> 'Modul Hinzufügen',
+	'CHOOSE_MODULE'					=> 'Modul Auswählen',
+	'CHOOSE_MODULE_EXP'				=> 'Wähle ein Modul von der Dropdown-Liste',
+	'SUCCESS_ADD'					=> 'Das Modul wurde erfolgreich hinzugefügt.',
+	'SUCCESS_DELETE'				=> 'Das Modul wurde erfolgreich entfernt.',
+	'NO_MODULES'					=> 'Es wurden keine Module gefunden.',
+	'MOVE_RIGHT'					=> 'Nach rechts',
+	'MOVE_LEFT'						=> 'Nach links',
+	'B3P_FILE_NOT_FOUND'			=> 'Die angegebene Datei konnte nicht gefunden werden',
+	'UNABLE_TO_MOVE'				=> 'Es ist nicht möglich den Block in die gewählte Spalte zu verschieben.',
+	'UNABLE_TO_MOVE_ROW'			=> 'Es ist nicht möglich den Block in die gewählte Reihe zu verschieben.',
+	'DELETE_MODULE_CONFIRM'			=> 'Sind Sie sicher, dass Sie das Modul "%1$s" löschen möchtest?',
+	'MODULE_RESET_SUCCESS'			=> 'Modul Einstellungen erfolgreich zurückgesetzt.',
+	'MODULE_RESET_CONFIRM'			=> 'Sind Sie sicher, dass Sie diese Einstellungen des Moduls "%1$s" zurücksetzen möchten?',
+	'MODULE_NOT_EXISTS'				=> 'Das gewählte Modul existiert nicht.',
+
+	'MODULE_OPTIONS'			=> 'Modul Optionen',
+	'MODULE_NAME'				=> 'Modul Name',
+	'MODULE_NAME_EXP'			=> 'Geben Sie hier den Namen ein der für das Modul in der Modul Konfiguration angezeigt werden soll.',
+	'MODULE_IMAGE'				=> 'Modul Bild',
+	'MODULE_IMAGE_EXP'			=> 'Geben Sie hier den Dateinamen des Modul Bildes ein. Das Bild muss sich in allen styles/{Dein Style}/theme/images/portal/ Ordnern befinden.',
+	'MODULE_PERMISSIONS'		=> 'Modul Berechtigungen',
+	'MODULE_PERMISSIONS_EXP'	=> 'Wählen Sie die Gruppen aus, die berechtigt sein sollen, das Modul zu sehen. Sollen alle Benutzer das Modul sehen können, wählen Sie nichts aus.<br />An- / abwählen mehrerer Gruppen indem man <samp>Strg</samp> gedrückt hält und klickt.',
+	'MODULE_IMAGE_WIDTH'		=> 'Modul Bild Breite',
+	'MODULE_IMAGE_WIDTH_EXP'	=> 'Geben Sie hier die Breite des Modul Bildes in Pixeln ein',
+	'MODULE_IMAGE_HEIGHT'		=> 'Modul Bild Höhe',
+	'MODULE_IMAGE_HEIGHT_EXP'	=> 'Geben Sie hier die Höhe des Modul Bildes in Pixeln ein',
+	'MODULE_RESET'				=> 'Modul Einstellungen zurücksetzen',
+	'MODULE_RESET_EXP'			=> 'Dies wird alle Einstellungen des Moduls auf die Standardeinstellungen zurücksetzen!',
+	'MODULE_STATUS'				=> 'Aktiviere Modul',
+	'MODULE_ADD_ONCE'			=> 'Diese Modul kann nur ein Mal hinzugefügt werden.',
+	'MODULE_IMAGE_ERROR'		=> 'Während dem Prüfen des Modul Bildes sind ein oder mehrere Fehler aufgetreten:',
+	'UNKNOWN_MODULE_METHOD'		=> 'Die Modul Methode des %1$s Moduls konnte nicht gefunden werden.',
+
+	// general
+	'ACP_PORTAL_CONFIG_INFO'				=> 'Allgemeine Einstellungen',
+	'ACP_PORTAL_GENERAL_TITLE'				=> 'Portal Verwaltung',
+	'ACP_PORTAL_GENERAL_TITLE_EXP'			=> 'Danke, dass Sie sich für board3 Portal entschieden haben. Auf dieser Seite können Sie Ihr Portal verwalten. Diese Anzeige gibt Ihnen einen schnellen Überblick über die verschiedenen Portal-Einstellungen.',
+	'ACP_PORTAL_SHOW_ALL'					=> 'Zeige portal auf allen Seiten',
+	'ACP_PORTAL_SHOW_ALL_EXP'				=> 'Zeigt das Portal auf allen Seiten des Forums an.',
+	'PORTAL_ENABLE'							=> 'Portal aktivieren',
+	'PORTAL_ENABLE_EXP'						=> 'Wenn deaktiviert, wird das komplette Portal abgeschaltet.',
+	'PORTAL_LEFT_COLUMN'					=> 'Linke Spalte aktivieren',
+	'PORTAL_LEFT_COLUMN_EXP'				=> 'Die Linke Spalte auf dem Portal anzeigen',
+	'PORTAL_RIGHT_COLUMN'					=> 'Rechte Spalte aktivieren',
+	'PORTAL_RIGHT_COLUMN_EXP'				=> 'Die Rechte Spalte auf dem Portal anzeigen',
+	'ACP_PORTAL_COLUMN_WIDTH_SETTINGS'		=> 'Breiteneinstellung der rechten und linken Spalte',
+	'PORTAL_LEFT_COLUMN_WIDTH'				=> 'Breite der linken Spalte',
+	'PORTAL_LEFT_COLUMN_WIDTH_EXP'			=> 'Änderen Sie hier die Breite der linken Spalte in Pixel, empfohlener Wert 180',
+	'PORTAL_RIGHT_COLUMN_WIDTH'				=> 'Breite der rechten Spalte',
+	'PORTAL_RIGHT_COLUMN_WIDTH_EXP'			=> 'Änderen Sie hier die Breite der rechten Spalte in Pixel, empfohlener Wert 180',
+	'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.',
+	'PORTAL_SHOW_ALL_SIDE'					=> 'Spalte die auf allen Seiten angezeigt werden soll',
+	'PORTAL_SHOW_ALL_SIDE_EXP'				=> 'Wählen Sie aus welche Spalte auf allen seiten des Portals angezeigt werden soll.',
+	'PORTAL_SHOW_ALL_LEFT'					=> 'Links',
+	'PORTAL_SHOW_ALL_RIGHT'					=> 'Rechts',
+
+	'LINK_ADDED'							=> 'Der Link wurde erfolgreich eingetragen',
+	'LINK_UPDATED'							=> 'Der Link wurde erfolgreich geändert',
+
+	// Install
+	'PORTAL_BASIC_INSTALL'			=> 'Füge Basismodule hinzu',
+	'PORTAL_BASIC_UNINSTALL'		=> 'Entferne Module von Datenbank',
+));

language/en/modules/portal_announcements_module.php

@@ -54,7 +54,7 @@ $lang = array_merge($lang, array(
 	'PORTAL_ANNOUNCEMENTS'						=> 'Display global announcements',
 	'PORTAL_ANNOUNCEMENTS_EXP'				=> 'Display this block on the portal.',
 	'PORTAL_ANNOUNCEMENTS_STYLE'				=> 'Compact global announcements block style',
-	'PORTAL_ANNOUNCEMENTS_STYLE_EXP'		=> '"Yes" means use the compact style for for global announcements. "No" means use the large style (text view).',
+	'PORTAL_ANNOUNCEMENTS_STYLE_EXP'		=> '"Yes" means use the compact style for global announcements. "No" means use the large style (text view).',
 	'PORTAL_NUMBER_OF_ANNOUNCEMENTS'			=> 'Number of announcements on the portal',
 	'PORTAL_NUMBER_OF_ANNOUNCEMENTS_EXP'	=> '0 means infinite',
 	'PORTAL_ANNOUNCEMENTS_DAY'					=> 'Number of days to display the announcement',

language/en/modules/portal_donation_module.php

@@ -61,5 +61,7 @@ $lang = array_merge($lang, array(
 	'ACP_PORTAL_PAYPAL_SETTINGS_EXP'		=> 'This is where you customize the Paypal block.',
 	'PORTAL_PAY_ACC'						=> 'Paypal account to use',
 	'PORTAL_PAY_ACC_EXP'					=> 'Enter your Paypal e-mail address eg. xxx@xxx.com',
-	'PORTAL_PAY_CUSTOM'				=> 'Append username to Paypal donation',
+	'PORTAL_PAY_CUSTOM'						=> 'Append username to Paypal donation',
+	'PORTAL_PAY_DEFAULT'					=> 'Default currency',
+	'PORTAL_PAY_DEFAULT_EXP'				=> 'Currency that will be selected by default in currency drop down list.'
 ));

language/en/modules/portal_leaders_module.php

@@ -35,7 +35,6 @@ $lang = array_merge($lang, array(
 	'NO_ADMINISTRATORS_P'	=> 'No Administrators',
 	'NO_MODERATORS_P'		=> 'No Moderators',
 	'NO_GROUPS_P'			=> 'No Groups',
-	'ACP_PORTAL_LEADERS'	=> 'The Team',
 
 	// ACP
 	'ACP_PORTAL_LEADERS'		=> 'Team Settings',

language/en/permissions_portal.php

@@ -0,0 +1,39 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1
+* @copyright (c) 2015 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(
+	// Adding the permissions
+	'ACL_A_MANAGE_PORTAL'		=> 'Can alter Portal settings',
+	'ACL_U_VIEW_PORTAL'			=> 'Can view the Portal',
+));

language/en/portal_acp.php

@@ -52,6 +52,7 @@ $lang = array_merge($lang, array(
 	'B3P_FILE_NOT_FOUND'			=> 'The requested file could not be found',
 	'UNABLE_TO_MOVE'				=> 'It is not possible to move the block to the selected column.',
 	'UNABLE_TO_MOVE_ROW'			=> 'It is not possible to move the block to the selected row.',
+	'UNABLE_TO_ADD_MODULE'			=> 'It is not possible to add the module to the selected column.',
 	'DELETE_MODULE_CONFIRM'			=> 'Are you sure you wish to delete the module "%1$s"?',
 	'MODULE_RESET_SUCCESS'			=> 'Successfully reset the module settings.',
 	'MODULE_RESET_CONFIRM'			=> 'Are you sure you wish to reset the settings of the module "%1$s"?',
@@ -73,20 +74,20 @@ $lang = array_merge($lang, array(
 	'MODULE_STATUS'				=> 'Enable module',
 	'MODULE_ADD_ONCE'			=> 'This module can only be added once.',
 	'MODULE_IMAGE_ERROR'		=> 'There was an error while checking for the module image:',
+	'UNKNOWN_MODULE_METHOD'		=> 'The %1$s module’s module method couldn’t be resolved.',
 
 	// general
 	'ACP_PORTAL_CONFIG_INFO'				=> 'General settings',
 	'ACP_PORTAL_GENERAL_TITLE'				=> 'Portal Administration',
 	'ACP_PORTAL_GENERAL_TITLE_EXP'			=> 'Thank you for choosing Board3 Portal! This is where you can manage your portal page. The options below let you customize the various general settings.',
+	'ACP_PORTAL_SHOW_ALL'					=> 'Show portal on all pages',
+	'ACP_PORTAL_SHOW_ALL_EXP'				=> 'Display the portal on all pages',
 	'PORTAL_ENABLE'							=> 'Enable Portal',
 	'PORTAL_ENABLE_EXP'						=> 'Turns the whole portal on or off',
 	'PORTAL_LEFT_COLUMN'					=> 'Enable left column',
 	'PORTAL_LEFT_COLUMN_EXP'				=> 'Switch to no if you wish to turn off the left column',
 	'PORTAL_RIGHT_COLUMN'					=> 'Enable right column',
 	'PORTAL_RIGHT_COLUMN_EXP'				=> 'Switch to no if you wish to turn off the right column',
-	'PORTAL_VERSION_CHECK'					=> 'Versioncheck on Portal',
-	'PORTAL_PHPBB_MENU'						=> 'phpBB menu',
-	'PORTAL_PHPBB_MENU_EXP'					=> 'Display the phpBB Header on the portal.',
 	'PORTAL_DISPLAY_JUMPBOX'				=> 'Display jumpbox',
 	'PORTAL_DISPLAY_JUMPBOX_EXP'			=> 'Display the jumpbox on the portal. The jumpbox will only be displayed if it is also enabled in the board features.',
 	'ACP_PORTAL_COLUMN_WIDTH_SETTINGS'		=> 'Left and right column width settings',
@@ -94,41 +95,15 @@ $lang = array_merge($lang, array(
 	'PORTAL_LEFT_COLUMN_WIDTH_EXP'			=> 'Change the width of the left column in pixels; recommended value is 180',
 	'PORTAL_RIGHT_COLUMN_WIDTH'				=> 'Width of the right column',
 	'PORTAL_RIGHT_COLUMN_WIDTH_EXP'			=> 'Change the width of the right column in pixels; recommended value is 180',
+	'PORTAL_SHOW_ALL_SIDE'					=> 'Column to display on all pages',
+	'PORTAL_SHOW_ALL_SIDE_EXP'				=> 'Choose which column should be shown on all pages.',
+	'PORTAL_SHOW_ALL_LEFT'					=> 'Left',
+	'PORTAL_SHOW_ALL_RIGHT'					=> 'Right',
 
 	'LINK_ADDED'							=> 'The link has been successfully added',
 	'LINK_UPDATED'							=> 'The link has been successfully updated',
 
-	// Upload Module
-	'MODULE_UPLOAD'					=> 'Upload a module',
-	'MODULE_UPLOAD_EXP'				=> 'Choose the zip file of the module you want to upload:',
-	'MODULE_UPLOAD_GO'				=> 'Upload',
-	'NO_MODULE_UPLOAD'				=> 'Your server configuration does not allow file uploads.',
-	'NO_FILE_B3P'					=> 'No zip file specified.',
-	'MODULE_UPLOADED'				=> 'Module uploaded successfully.',
-	'MODULE_UPLOAD_MKDIR_FAILURE'	=> 'Unable to create a folder.',
-	'MODULE_COPY_FAILURE'			=> 'Unable to copy the following file: %1$s',
-	'MODULE_CORRUPTED'				=> 'The module you are trying to upload seems to be corrupted.',
-	'PORTAL_NEW_FILES'				=> 'New files',
-	'PORTAL_MODULE_SOURCE'			=> 'Source',
-	'PORTAL_MODULE_TARGET'			=> 'Target',
-	'PORTAL_MODULE_STATUS'			=> 'Status',
-	'PORTAL_MODULE_SUCCESS'			=> 'Success',
-	'PORTAL_MODULE_ERROR'			=> 'Error',
-
 	// Install
 	'PORTAL_BASIC_INSTALL'			=> 'Adding basic set of modules',
 	'PORTAL_BASIC_UNINSTALL'		=> 'Removing modules from database',
-
-	/**
-	* A copy of Handyman` s MOD version check, to view it on the portal overview
-	*/
-	'ANNOUNCEMENT_TOPIC'	=> 'Release Announcement',
-	'CURRENT_VERSION'		=> 'Current Version',
-	'DOWNLOAD_LATEST'		=> 'Download Latest Version',
-	'LATEST_VERSION'		=> 'Latest Version',
-	'NO_INFO'				=> 'Version server could not be contacted',
-	'NOT_UP_TO_DATE'		=> '%s is not up to date',
-	'RELEASE_ANNOUNCEMENT'	=> 'Annoucement Topic',
-	'UP_TO_DATE'			=> '%s is up to date',
-	'VERSION_CHECK'			=> 'MOD Version Check',
 ));