hey dev team mates, here are the brand new beta checkins (as promised). Please ensure this stays in our private cvs until the 23rd June, except the bug fixes.

git-svn-id: file:///svn/phpbb/trunk@6092 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/adm/style/acp_permissions.html

@@ -6,9 +6,7 @@
 	
 	<h1>{L_ACP_PERMISSIONS}</h1>
 
-	<p>{L_ACP_PERMISSIONS_EXPLAIN}</p>
-
-	Here, an introductionary text will be placed, explaining permissions and the several menu items. Also adding quick links to this page.
+	{L_ACP_PERMISSIONS_EXPLAIN}
 
 <!-- ENDIF -->
 

phpBB/common.php

@@ -9,10 +9,6 @@
 * Minimum Requirement: PHP 4.3.3
 */
 
-// Remove the following line to enable this software, be sure you note what it
-// says before continuing
-die('This software is unsupported in any and all respects. By removing this notice (found in common.php) you are noting your acceptance of this. Do not ask support questions of any kind for this release at either area51.phpbb.com or www.phpbb.com. Support for this version will appear when the beta cycle begins');
-
 /**
 */
 if (!defined('IN_PHPBB'))
@@ -170,9 +166,9 @@ $config = $cache->obtain_config();
 $dss_seeded = false;
 
 // Warn about install/ directory
-if (file_exists('install'))
+if (file_exists($phpbb_root_path . 'install'))
 {
-//	trigger_error('REMOVE_INSTALL');
+	trigger_error('REMOVE_INSTALL');
 }
 
 ?>

phpBB/includes/acp/acp_jabber.php

@@ -61,7 +61,7 @@ class acp_jabber
 		// try to create account if it doesn't exist
 		if ($jab_enable)
 		{
-			if ($jab_host != $config['jab_host'] || $jab_username != $config['jab_username'])
+			if (($jab_host != $config['jab_host'] || $jab_username != $config['jab_username']) && $jab_username)
 			{
 				if (!$jabber->connect())
 				{

phpBB/install/schemas/schema_data.sql

@@ -456,10 +456,10 @@ INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT
 INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 10, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%';
 
 # Standard Moderator (m_)
-INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 11, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%' AND auth_option IN ('m_', 'm_approve', 'm_delete', 'm_edit', 'm_info', 'm_report', 'm_warn');
+INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 11, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%' AND auth_option NOT IN ('m_approve', 'm_ban', 'm_chgposter', 'm_delete');
 
 # Simple Moderator (m_)
-INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 12, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%' AND auth_option NOT IN ('m_approve', 'm_ban', 'm_chgposter', 'm_delete', 'm_warn');
+INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 12, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%' AND auth_option IN ('m_', 'm_approve', 'm_delete', 'm_edit', 'm_info', 'm_report', 'm_warn');
 
 # Queue Moderator (m_)
 INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 13, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%' AND auth_option IN ('m_', 'm_approve', 'm_edit');

phpBB/language/en/acp/permissions.php

@@ -29,6 +29,26 @@ if (empty($lang) || !is_array($lang))
 // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
 
 $lang = array_merge($lang, array(
+	'ACP_PERMISSIONS_EXPLAIN'	=> '
+		<p>Permissions are highly granular and grouped into four major sections, which are:</p>
+
+		<h2>Global Permissions</h2>
+		<p>These are used to control access on a global level and apply to the entire bulletin board. They are further divided into Users Permissions, Groups Permissions, Administrators and Global Moderators.</p>
+
+		<h2>Forum Based Permissions</h2>
+		<p>These are used to control access on a per forum basis. They are further divided into Forum Permissions, Forum Moderators, Users Forum Permissions and Groups Forum Permissions.</p>
+
+		<h2>Permission Roles</h2>
+		<p>These are used to create different sets of permissions for the different permission types later being able to be assigned on a role-based basis. The default roles should cover the administration of bulletin boards large and small, though within each of the four divisions, you can add/edit/delete roles as you see fit.</p>
+
+		<h2>Permission Mask</h2>
+		<p>These are used to view the effective permissions assigned to Users, Moderators (Local and Global), Administrators or Forums.</p>
+	
+		<br />
+
+		<p>For further information on setting up and managing permissions on your phpBB3 forum, please see <a href="http://www.phpbb.com/support/documentation/3.0/quickstart/quick_permissions.html">Chapter 1.5 of our Quick Start Guide</a>.</p>
+	',
+
 	'ACL_NO'				=> 'No',
 	'ACL_SET'				=> 'Setting Permissions',
 	'ACL_SET_EXPLAIN'		=> 'Permissions are based on a simple YES/NO system. Setting an option to NO for a user or usergroup overrides any other value assigned to it. If you do not wish to assign a value for an option for this user or group select UNSET. If values are assigned for this option elsewhere they will be used in preference, else NO is assumed. All objects marked (with the checkbox in front of them) will inherit the permission set you defined.',

phpBB/language/en/install.php

@@ -175,8 +175,7 @@ $lang = array_merge($lang, array(
 	'NO_LOCATION'				=> 'Cannot determine location',
 	'NO_TABLES_FOUND'			=> 'No tables found.',
 // TODO: Write some explanatory introduction text
-	'OVERVIEW_BODY'				=> 'Some brief explanatory text about phpBB will go here.</p><p>This installation system will guide you through the process of installing phpBB, converting from a different software package or updating to the latest version of phpBB. For more information on each option, select it from the menu above',
-
+	'OVERVIEW_BODY'					=> 'Welcome to our first public beta of the next-generation of phpBB after 2.0.x, phpBB 3.0! This beta release is intended for advanced users to try out on dedicated development enviroments to help us finish creating the best Opensource Bulletin Board solution available.</p><p><strong style="text-transform: uppercase;">Note:</strong> This release is <strong style="text-transform: uppercase;">not final</strong> and made available for testing purposes <strong style="text-transform: uppercase;">only</strong>.</p><p>This installation system will guide you through the process of installing phpBB, converting from a different software package or updating to the latest version of phpBB. For more information on each option, select it from the menu above.',
 	'PHP_OPTIONAL_MODULE'			=> 'Optional Modules',
 	'PHP_OPTIONAL_MODULE_EXPLAIN'	=> '<strong>Optional</strong> - These modules or applications are optional, you do not need these to use phpBB 3.0. However if you do have them they will will enable greater functionality.',
 	'PHP_SUPPORTED_DB'				=> 'Supported Databases',
@@ -220,7 +219,7 @@ $lang = array_merge($lang, array(
 	'SUB_SUPPORT'				=> 'Support',
 	'SUCCESSFUL_CONNECT'		=> 'Successful Connection',
 // TODO: Write some text on obtaining support
-	'SUPPORT_BODY'				=> 'Some text on obtaining support, etc can go here.</p><p>Probably this can be copied from the documentation</p><p>To ensure you stay up to date with the latest news and releases, why not <a href="http://www.phpbb.com/support/" target="_new">subscribe to our mailing list</a>',
+	'SUPPORT_BODY'				=> 'During the beta phase a minimal level of support will be given at <a href="http://www.phpbb.com/phpBB/viewforum.php?f=46">the phpBB 3.0 Beta1 support forum</a>. We will provide answers to general setup questions, configuration problems and support for determining common problems mostly related to bugs. We will not support modifications, custom code/style additions or any users using the beta packages within a live environment.</p><p>For additional assistance, please refer to our <a href="http://www.phpbb.com/support/documentation/3.0/quickstart/quick_start_guide.html">Quick Start Guide</a>.</p><p>To ensure you stay up to date with the latest news and releases, why not <a href="http://www.phpbb.com/support/" target="_new">subscribe to our mailing list</a>',
 	'SYNC_FORUMS'				=> 'Starting to sync forums',
 	'SYNC_TOPICS'				=> 'Starting to sync topics',
 	'SYNC_TOPIC_ID'				=> 'Synchronising topics from topic_id $1%s to $2%s',

phpBB/styles/subSilver/template/editor.js

@@ -213,6 +213,7 @@ function addquote(post_id, username)
 		if (divarea.innerHTML)
 		{
 			theSelection = divarea.innerHTML.replace(/<br>/ig, '\n');
+			theSelection = theSelection.replace(/<br\/>/ig, '\n');
 		}
 		else if (document.all)
 		{