- 1.i. Changes since 3.0.RC1
+ 1.i. Changes since 3.0.RC2
+
+
+
+
+
[Fix] Re-allow searching within the memberlist
+
[Fix] Force prune related values to integers during conversions
+
[Fix] Updater now detects successfully merged files having conflicts and user chose to merge with modifications (Bug #12685)
+
[Fix] Updater is no longer listing missing language entries and styles if these had been removed (Bug #12655)
+
[Fix] Correct approval of posts in global announcements (Bug #12699)
+
[Sec] Do not allow setup spiders/robots to post, even if permissions are given. We see no reason why this should be possible. (Thanks to Frank Rizzo for convincing us regarding this)
+
[Sec] Do not display the last active column within the memberlist if u_viewonline permission is not given (Bug #12797)
+
[Fix] Display custom profile field "date" based on users language (Bug #12787)
+
[Fix] Allow adding of help language files within subdirectories (Bug #12783)
+
[Fix] Correctly apply smileys on posting having # within their emotion code
+
[Fix] Correctly convert smileys having double quotes within their emotion code (Bug #12731)
+
[Fix] The converter now adds the protocol to user website profile fields missing it (Bug #12819)
+
[Fix] Correctly escape banned ip/email using wildcard for ban check (Bug #12815)
+
[Fix] Fixed some very nasty opera bugs (dropdown list bug, cpu spike bug) (Bug #12763, #11609)
+
[Fix] Font colour list having the correct height in IE (Bug #9571)
+
[Feature] Added mark/unmark all links to the bots page (Bug #12461)
+
[Fix] Introduced check on duplicate usernames during bot creation/edit (Bug #12461)
+
[Fix] Allow multibyte letters for smilie codes(Bug #12321)
+
[Fix] Correctly chmod created cache files (Bug #12859)
+
[Fix] Use our global expression for checking email syntax in memberlist (Bug #12827)
+
[Fix] Correctly retrieve/refresh templates stored in database if using subdirectories within template directory (Bug #12839)
+
[Fix] Correctly translate special group names in ucp_groups.php (Bug #12597)
+
[Fix] Search boxes not loosing session id (changing method from get to post) (Bug #12643)
+
[Fix] Make sure the automatic update is also working for those having fsockopen disabled
+
[Fix] Simulate recache of theme data on automatic update finished page - recaching it if css data changed
+
[Feature] Allow dropping in custom "info_[module class]_*.php" files to language/*/mods directory for inclusion into the menu structure without the need to modify phpBB language files for menu placements
+
[Fix] Added login box to egosearch (Bug #12941)
+
[Fix] Deal with slashed quotes during quote bbcode conversion (Bug #12607)
+
[Fix] Minor language and style fixes (Bugs #12235, #12493, #11949)
+
[Feature] Added backlinks to mcp_report (Bug #12905)
+
[Fix] Only check usernames in guest posts upon edit (Bug #11349)
+
[Fix] Consider viewonline permission when viewing friends/foes (Bug #12955)
+
[Fix] Added proper unicode support to ban reasons (Bug #12947)
+
[Fix] The forum/topic sync code now recognizes other ways that the latest post in a topic can be expressed (Bug #12947) - patch provided by APTX
+
[Fix] Topic deletion via the user post deletion mechanism did not take into account statistics for forums that hold shadow topics (Bug #12981)
+
[Fix] Allow for negative and decimal numbers to be in transposed queries in the Oracle and Firebird DBAL (Bug #13033)
+
[Fix] Some jabber related bugs (Bug #12989, #11805, #11809)
+
[Fix] Added UTF-8 support for banning via the MCP (Bug #13013)
+
[Fix] Properly detect the script name in session::extract_current_page() if PHP_SELF is not defined (Bug #12705) - patch provided by ToonArmy
+
[Fix] Show role mask for global permission class under Permissions->Permission Roles (Bug #13057)
In other words use single quotes where no variable substitution is required or where the variable involved shouldn't appear within double quotes. Otherwise use double quotes.
+
Avoid DB specific SQL:
+
The "not equals operator", as defined by the SQL:2003 standard, is "<>"
+
+
// This is wrong.
+
+$sql = 'SELECT *
+ FROM ' . SOME_TABLE . '
+ WHERE a != 2';
+
+
+
// This is right.
+
+$sql = 'SELECT *
+ FROM ' . SOME_TABLE . '
+ WHERE a <> 2';
+
' . $lang['SQL_FAILURE_EXPLAIN'] . '';
@@ -1338,6 +1389,86 @@ function sql_create_index($dbms, $index_name, $table_name, $column)
}
}
+// List all of the indices that belong to a table,
+// does not count:
+// * UNIQUE indices
+// * PRIMARY keys
+function sql_list_index($dbms, $table_name)
+{
+ global $dbms_type_map, $db;
+ global $errored, $error_ary;
+
+ $index_array = array();
+
+ if ($dbms == 'mssql')
+ {
+ $sql = "EXEC sp_statistics '$table_name'";
+ $result = $db->sql_query($sql);
+ while ($row = $db->sql_fetchrow($result))
+ {
+ if ($row['TYPE'] == 3)
+ {
+ $index_array[] = $row['INDEX_NAME'];
+ }
+ }
+ $db->sql_freeresult($result);
+ }
+ else
+ {
+ switch ($dbms)
+ {
+ case 'firebird':
+ $sql = "SELECT LOWER(RDB$INDEX_NAME) as index_name
+ FROM RDB$INDICES
+ WHERE RDB$RELATION_NAME = " . strtoupper($table_name) . "
+ AND RDB$UNIQUE_FLAG IS NULL
+ AND RDB$FOREIGN_KEY IS NULL";
+ $col = 'index_name';
+ break;
+
+ case 'postgres':
+ $sql = "SELECT ic.relname as index_name
+ FROM pg_class bc, pg_class ic, pg_index i
+ WHERE (bc.oid = i.indrelid)
+ AND (ic.oid = i.indexrelid)
+ AND (bc.relname = '" . $table_name . "')
+ AND (i.indisunique != 't')
+ AND (i.indisprimary != 't')";
+ $col = 'index_name';
+ break;
+
+ case 'mysql_40':
+ case 'mysql_41':
+ $sql = 'SHOW KEYS
+ FROM ' . $table_name .'
+ WHERE Non_unique = 1';
+ $col = 'Key_name';
+ break;
+
+ case 'oracle':
+ $sql = "SELECT index_name
+ FROM user_indexes
+ WHERE table_name = '" . $table_name . "'
+ AND generated = 'N'";
+ break;
+
+ case 'sqlite':
+ $sql = "PRAGMA index_info('" . $table_name . "');";
+ $col = 'name';
+ break;
+ }
+
+ $result = $db->sql_query($sql);
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $index_array[] = $row[$col];
+ }
+ $db->sql_freeresult($result);
+ }
+
+ return array_map('strtolower', $index_array);
+}
+
/**
* Change column type (not name!)
*/
@@ -1373,7 +1504,16 @@ function sql_column_change($dbms, $table_name, $column_name, $column_data)
break;
case 'postgres':
- $sql = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN ' . $column_name . ' SET ' . $column_data['column_type_sql'];
+ $default_pos = strpos($column_data['column_type_sql'], ' DEFAULT');
+
+ if ($default_pos === false)
+ {
+ $sql = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN ' . $column_name . ' TYPE ' . $column_data['column_type_sql'];
+ }
+ else
+ {
+ $sql = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN ' . $column_name . ' TYPE ' . substr($column_data['column_type_sql'], 0, $default_pos) . ', ALTER COLUMN ' . $column_name . ' SET ' . substr($column_data['column_type_sql'], $default_pos + 1);
+ }
_sql($sql, $errored, $error_ary);
break;
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 5244e656c9..7fd4c881c6 100755
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -380,7 +380,7 @@ class install_install extends module
}
// Can we find Imagemagick anywhere on the system?
- $exe = (defined('PHP_OS') && strpos(strtolower(PHP_OS), 'win') === 0) ? '.exe' : '';
+ $exe = (DIRECTORY_SEPARATOR == '\\') ? '.exe' : '';
$magic_home = getenv('MAGICK_HOME');
$img_imagick = '';
@@ -868,8 +868,6 @@ class install_install extends module
$available_dbms = get_available_dbms($dbms);
$check_exts = array_merge(array($available_dbms[$dbms]['MODULE']), $this->php_dlls_other);
- $suffix = (defined('PHP_OS') && strpos(strtolower(PHP_OS), 'win') === 0) ? 'dll' : 'so';
-
foreach ($check_exts as $dll)
{
if (!@extension_loaded($dll))
@@ -879,7 +877,7 @@ class install_install extends module
continue;
}
- $load_extensions[] = "$dll.$suffix";
+ $load_extensions[] = $dll . '.' . PHP_SHLIB_SUFFIX;
}
}
@@ -892,6 +890,8 @@ class install_install extends module
}
@fclose($fp);
+ @chmod($phpbb_root_path . 'cache/install_lock', 0666);
+
$dbpasswd = htmlspecialchars_decode($dbpasswd);
$load_extensions = implode(',', $load_extensions);
@@ -919,7 +919,7 @@ class install_install extends module
// Assume it will work ... if nothing goes wrong below
$written = true;
- if (!($fp = @fopen($phpbb_root_path . 'config.'.$phpEx, 'w')))
+ if (!($fp = @fopen($phpbb_root_path . 'config.' . $phpEx, 'w')))
{
// Something went wrong ... so let's try another method
$written = false;
@@ -932,6 +932,11 @@ class install_install extends module
}
@fclose($fp);
+
+ if ($written)
+ {
+ @chmod($phpbb_root_path . 'config.' . $phpEx, 0644);
+ }
}
if (isset($_POST['dldone']))
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 3a68e271ed..bf1912076f 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -408,11 +408,65 @@ class install_update extends module
// Add database update to log
add_log('admin', 'LOG_UPDATE_PHPBB', $this->current_version, $this->latest_version);
- $cache->purge();
+ // Refresh prosilver css data - this may cause some unhappy users, but
+ $sql = 'SELECT *
+ FROM ' . STYLES_THEME_TABLE . "
+ WHERE theme_name = 'prosilver'";
+ $result = $db->sql_query($sql);
+ $theme = $db->sql_fetchrow($result);
+ $db->sql_freeresult($result);
+
+ if ($theme)
+ {
+ $recache = (empty($theme['theme_data'])) ? true : false;
+ $update_time = time();
+
+ // We test for stylesheet.css because it is faster and most likely the only file changed on common themes
+ if (!$recache && $theme['theme_mtime'] < @filemtime("{$phpbb_root_path}styles/" . $theme['theme_path'] . '/theme/stylesheet.css'))
+ {
+ $recache = true;
+ $update_time = @filemtime("{$phpbb_root_path}styles/" . $theme['theme_path'] . '/theme/stylesheet.css');
+ }
+ else if (!$recache)
+ {
+ $last_change = $theme['theme_mtime'];
+
+ foreach (glob("{$phpbb_root_path}styles/{$theme['theme_path']}/theme/*.css", GLOB_NOSORT) as $file)
+ {
+ if ($last_change < @filemtime($file))
+ {
+ $recache = true;
+ break;
+ }
+ }
+ }
+
+ if ($recache)
+ {
+ include_once($phpbb_root_path . 'includes/acp/acp_styles.' . $phpEx);
+
+ $theme['theme_data'] = acp_styles::db_theme_data($theme);
+ $theme['theme_mtime'] = $update_time;
+
+ // Save CSS contents
+ $sql_ary = array(
+ 'theme_mtime' => $theme['theme_mtime'],
+ 'theme_data' => $theme['theme_data']
+ );
+
+ $sql = 'UPDATE ' . STYLES_THEME_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+ WHERE theme_id = ' . $theme['theme_id'];
+ $db->sql_query($sql);
+
+ $cache->destroy('sql', STYLES_THEME_TABLE);
+ }
+ }
$db->sql_return_on_error(true);
$db->sql_query('DELETE FROM ' . CONFIG_TABLE . " WHERE config_name = 'version_update_from'");
$db->sql_return_on_error(false);
+
+ $cache->purge();
}
break;
@@ -776,11 +830,18 @@ class install_update extends module
global $phpbb_root_path, $template, $user;
$this->tpl_name = 'install_update_diff';
+
+ // Got the diff template itself updated? If so, we are able to directly use it
+ if (in_array('adm/style/install_update_diff.html', $this->update_info['files']))
+ {
+ $this->tpl_name = '../../install/update/new/adm/style/install_update_diff';
+ }
+
$this->page_title = 'VIEWING_FILE_DIFF';
$status = request_var('status', '');
$file = request_var('file', '');
- $diff_mode = request_var('diff_mode', 'inline');
+ $diff_mode = request_var('diff_mode', 'side_by_side');
// First of all make sure the file is within our file update list with the correct status
$found_entry = array();
@@ -852,6 +913,8 @@ class install_update extends module
'S_DIFF_CONFLICT_FILE' => true,
'NUM_CONFLICTS' => $diff->merged_output(false, false, false, true))
);
+
+ $diff = $this->return_diff($phpbb_root_path . $file, $diff->merged_output());
break;
}
@@ -947,7 +1010,11 @@ class install_update extends module
}
else
{
- $update_list['no_update'][] = $file;
+ // Do not include style-related or language-related content
+ if (strpos($file, 'styles/') !== 0 && strpos($file, 'language/') !== 0)
+ {
+ $update_list['no_update'][] = $file;
+ }
}
unset($this->update_info['files'][$index]);
}
@@ -1090,8 +1157,25 @@ class install_update extends module
if ($diff->merged_output(false, false, false, true))
{
$update_ary['conflicts'] = $diff->_conflicting_blocks;
- $update_list['conflict'][] = $update_ary;
+ // There is one special case... users having merged with a conflicting file... we need to check this
+ $tmp = array(
+ 'file1' => file_get_contents($phpbb_root_path . $file),
+ 'file2' => implode("\n", $diff->merged_orig_output()),
+ );
+
+ $diff = &new diff($tmp['file1'], $tmp['file2'], false);
+ $empty = $diff->is_empty();
+
+ if ($empty)
+ {
+ unset($update_ary['conflicts']);
+ unset($diff);
+ $update_list['up_to_date'][] = $update_ary;
+ return;
+ }
+
+ $update_list['conflict'][] = $update_ary;
unset($diff);
return;
@@ -1108,6 +1192,8 @@ class install_update extends module
if ($empty)
{
+ unset($diff);
+
$update_list['up_to_date'][] = $update_ary;
return;
}
@@ -1160,6 +1246,19 @@ class install_update extends module
{
$info = $this->test_update;
}
+
+ // If info is false the fsockopen function may not be working. Instead get the latest version from our update file (and pray it is up-to-date)
+ if ($info === false)
+ {
+ $update_info = array();
+ include($phpbb_root_path . 'install/update/index.php');
+ $info = (empty($update_info) || !is_array($update_info)) ? false : $update_info;
+
+ if ($info !== false)
+ {
+ $info = (!empty($info['version']['to'])) ? trim($info['version']['to']) : false;
+ }
+ }
break;
case 'update_info':
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index f1c74512eb..d0f9cf88d1 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -136,8 +136,8 @@ CREATE TABLE phpbb_banlist (
ban_start INTEGER DEFAULT 0 NOT NULL,
ban_end INTEGER DEFAULT 0 NOT NULL,
ban_exclude INTEGER DEFAULT 0 NOT NULL,
- ban_reason BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL,
- ban_give_reason BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL
+ ban_reason VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
+ ban_give_reason VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE
);;
ALTER TABLE phpbb_banlist ADD PRIMARY KEY (ban_id);;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 6c2e2ee24d..7dd9c4e924 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -178,8 +178,8 @@ CREATE TABLE [phpbb_banlist] (
[ban_start] [int] DEFAULT (0) NOT NULL ,
[ban_end] [int] DEFAULT (0) NOT NULL ,
[ban_exclude] [int] DEFAULT (0) NOT NULL ,
- [ban_reason] [varchar] (3000) DEFAULT ('') NOT NULL ,
- [ban_give_reason] [varchar] (3000) DEFAULT ('') NOT NULL
+ [ban_reason] [varchar] (255) DEFAULT ('') NOT NULL ,
+ [ban_give_reason] [varchar] (255) DEFAULT ('') NOT NULL
) ON [PRIMARY]
GO
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 44b292b7e7..7fee7f696d 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -98,8 +98,8 @@ CREATE TABLE phpbb_banlist (
ban_start int(11) UNSIGNED DEFAULT '0' NOT NULL,
ban_end int(11) UNSIGNED DEFAULT '0' NOT NULL,
ban_exclude tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
- ban_reason text NOT NULL,
- ban_give_reason text NOT NULL,
+ ban_reason varchar(255) DEFAULT '' NOT NULL,
+ ban_give_reason varchar(255) DEFAULT '' NOT NULL,
PRIMARY KEY (ban_id),
KEY ban_end (ban_end),
KEY ban_user (ban_userid, ban_exclude),
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 489c7e7bc5..69889a3db2 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -220,8 +220,8 @@ CREATE TABLE phpbb_banlist (
ban_start number(11) DEFAULT '0' NOT NULL,
ban_end number(11) DEFAULT '0' NOT NULL,
ban_exclude number(1) DEFAULT '0' NOT NULL,
- ban_reason varchar2(3000) DEFAULT '' ,
- ban_give_reason varchar2(3000) DEFAULT '' ,
+ ban_reason varchar2(765) DEFAULT '' ,
+ ban_give_reason varchar2(765) DEFAULT '' ,
CONSTRAINT pk_phpbb_banlist PRIMARY KEY (ban_id)
)
/
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index b1ff1d1d11..c49423bcf9 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -199,8 +199,8 @@ CREATE TABLE phpbb_banlist (
ban_start INT4 DEFAULT '0' NOT NULL CHECK (ban_start >= 0),
ban_end INT4 DEFAULT '0' NOT NULL CHECK (ban_end >= 0),
ban_exclude INT2 DEFAULT '0' NOT NULL CHECK (ban_exclude >= 0),
- ban_reason varchar(3000) DEFAULT '' NOT NULL,
- ban_give_reason varchar(3000) DEFAULT '' NOT NULL,
+ ban_reason varchar(255) DEFAULT '' NOT NULL,
+ ban_give_reason varchar(255) DEFAULT '' NOT NULL,
PRIMARY KEY (ban_id)
);
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 321cae118c..81e8c3cf80 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -138,7 +138,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_online_guests
INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_online_time', '5');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_onlinetrack', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_search', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_tplcompile', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_tplcompile', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_user_activity', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_attachments', '3');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_attachments_pm', '1');
@@ -205,7 +205,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page',
INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.RC2');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.RC3');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 70b4f8de22..156e4bfc76 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -97,8 +97,8 @@ CREATE TABLE phpbb_banlist (
ban_start INTEGER UNSIGNED NOT NULL DEFAULT '0',
ban_end INTEGER UNSIGNED NOT NULL DEFAULT '0',
ban_exclude INTEGER UNSIGNED NOT NULL DEFAULT '0',
- ban_reason text(65535) NOT NULL DEFAULT '',
- ban_give_reason text(65535) NOT NULL DEFAULT ''
+ ban_reason varchar(255) NOT NULL DEFAULT '',
+ ban_give_reason varchar(255) NOT NULL DEFAULT ''
);
CREATE INDEX phpbb_banlist_ban_end ON phpbb_banlist (ban_end);
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 74a80c5047..90676cf6bc 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -356,7 +356,7 @@ $lang = array_merge($lang, array(
'EMAIL_CHECK_MX' => 'Check e-mail domain for valid MX record',
'EMAIL_CHECK_MX_EXPLAIN' => 'If enabled, the e-mail domain provided on registration and profile changes is checked for a valid MX record.',
'FORCE_PASS_CHANGE' => 'Force password change',
- 'FORCE_PASS_CHANGE_EXPLAIN' => 'Require user to change their password after a set number of days. Set this value to 0 disables this behaviour.',
+ 'FORCE_PASS_CHANGE_EXPLAIN' => 'Require user to change their password after a set number of days. Setting this value to 0 disables this behaviour.',
'FORWARDED_FOR_VALID' => 'Validated X_FORWARDED_FOR header',
'FORWARDED_FOR_VALID_EXPLAIN' => 'Sessions will only be continued if the sent X_FORWARDED_FOR header equals the one sent with the previous request. Bans will be checked against IPs in X_FORWARDED_FOR too.',
'IP_VALID' => 'Session IP validation',
diff --git a/phpBB/language/en/acp/bots.php b/phpBB/language/en/acp/bots.php
index d06a90d363..a166142d24 100644
--- a/phpBB/language/en/acp/bots.php
+++ b/phpBB/language/en/acp/bots.php
@@ -33,7 +33,7 @@ if (empty($lang) || !is_array($lang))
// Bot settings
$lang = array_merge($lang, array(
'BOTS' => 'Manage bots',
- 'BOTS_EXPLAIN' => 'Bots or crawlers are automated agents most commonly used by search engines to update their databases. Since they rarely make proper use of sessions they can distort visitor counts, increase load and sometimes fail to index sites correctly. Here you can define a special type of user to overcome these problems.',
+ 'BOTS_EXPLAIN' => '"Bots", "spiders" or "crawlers" are automated agents most commonly used by search engines to update their databases. Since they rarely make proper use of sessions they can distort visitor counts, increase load and sometimes fail to index sites correctly. Here you can define a special type of user to overcome these problems.',
'BOT_ACTIVATE' => 'Activate',
'BOT_ACTIVE' => 'Bot active',
'BOT_ADD' => 'Add bot',
@@ -51,12 +51,11 @@ $lang = array_merge($lang, array(
'BOT_IP_EXPLAIN' => 'Partial matches are allowed, separate addresses with a comma.',
'BOT_NAME' => 'Bot name',
'BOT_NAME_EXPLAIN' => 'Used only for your own information.',
+ 'BOT_NAME_TAKEN' => 'The name is already in use on your board and can\'t be used for the Bot.',
'BOT_NEVER' => 'Never',
'BOT_STYLE' => 'Bot style',
'BOT_STYLE_EXPLAIN' => 'The style used for the board by the bot.',
'BOT_UPDATED' => 'Existing bot updated successfully.',
- 'BOT_VIS' => 'Bot visible',
- 'BOT_VIS_EXPLAIN' => 'Allow bot to be seen by all users in online lists.',
'ERR_BOT_AGENT_MATCHES_UA' => 'The bot agent you supplied is similar to the one you are currently using. Please adjust the agent for this bot.',
'ERR_BOT_NO_IP' => 'The IP addresses you supplied were invalid or the hostname could not be resolved.',
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index 936dc9bf3c..562e3a89cc 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -31,7 +31,7 @@ if (empty($lang) || !is_array($lang))
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
$lang = array_merge($lang, array(
- 'ACP_GROUPS_MANAGE_EXPLAIN' => 'From this panel you can administrate all your usergroups, you can delete, create and edit existing groups. You may choose group leaders, toggle open/closed group status and set the group name and description.',
+ 'ACP_GROUPS_MANAGE_EXPLAIN' => 'From this panel you can administrate all your usergroups. You can delete, create and edit existing groups. Furthermore, you may choose group leaders, toggle open/hidden/closed group status and set the group name and description.',
'ADD_USERS' => 'Add users',
'ADD_USERS_EXPLAIN' => 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Additionally you can define them as group leaders. Please enter each username on a separate line.',
@@ -48,7 +48,7 @@ $lang = array_merge($lang, array(
'GROUP_AVATAR_EXPLAIN' => 'This image will be displayed in the Group Control Panel.',
'GROUP_CLOSED' => 'Closed',
'GROUP_COLOR' => 'Group colour',
- 'GROUP_COLOR_EXPLAIN' => 'Defines the colour members usernames will appear in, leave blank for user default.',
+ 'GROUP_COLOR_EXPLAIN' => 'Defines the colour members’ usernames will appear in, leave blank for user default.',
'GROUP_CONFIRM_ADD_USER' => 'Are you sure that you want to add the user %1$s to the group?',
'GROUP_CONFIRM_ADD_USERS' => 'Are you sure that you want to add the users %1$s to the group?',
'GROUP_CREATED' => 'Group has been created successfully.',
@@ -59,10 +59,10 @@ $lang = array_merge($lang, array(
'GROUP_DEMOTE' => 'Demote group leader',
'GROUP_DESC' => 'Group description',
'GROUP_DETAILS' => 'Group details',
- 'GROUP_EDIT_EXPLAIN' => 'Here you can edit an existing group. You can change its name, description and type (open, closed, etc.). You can also set certain group wide options such as colouration, rank, etc. Changes made here override users current settings. Please note that group members can alter their avatar unless you set appropriate user permissions.',
+ 'GROUP_EDIT_EXPLAIN' => 'Here you can edit an existing group. You can change its name, description and type (open, closed, etc.). You can also set certain group wide options such as colouration, rank, etc. Changes made here override users’ current settings. Please note that group members can override group-avatar settings, unless you set appropriate user permissions.',
'GROUP_ERR_USERS_EXIST' => 'The specified users are already members of this group.',
'GROUP_FOUNDER_MANAGE' => 'Founder manage only',
- 'GROUP_FOUNDER_MANAGE_EXPLAIN' => 'Restrict group management for this group for founders only. Users having group permissions are still able to see this group as well as this groups members.',
+ 'GROUP_FOUNDER_MANAGE_EXPLAIN' => 'Restrict management of this group to founders only. Users having group permissions are still able to see this group as well as this group’s members.',
'GROUP_HIDDEN' => 'Hidden',
'GROUP_LANG' => 'Group language',
'GROUP_LEAD' => 'Group leaders',
@@ -86,10 +86,7 @@ $lang = array_merge($lang, array(
'GROUP_RECEIVE_PM' => 'Group able to receive private messages',
'GROUP_RECEIVE_PM_EXPLAIN' => 'Please note that hidden groups are not able to be messaged, regardless of this setting.',
'GROUP_REQUEST' => 'Request',
- 'GROUP_SETTINGS' => 'Set user preferences',
- 'GROUP_SETTINGS_EXPLAIN' => 'Here you can force changes in users current preferences. Please note these settings are not saved for the group itself. They are intended as a quick method of altering the preferences of all users in this group.',
'GROUP_SETTINGS_SAVE' => 'Group wide settings',
- 'GROUP_TIMEZONE' => 'Group timezone',
'GROUP_TYPE' => 'Group type',
'GROUP_TYPE_EXPLAIN' => 'This determines which users can join or view this group.',
'GROUP_UPDATED' => 'Group preferences updated successfully.',
@@ -106,7 +103,7 @@ $lang = array_merge($lang, array(
'NO_PERMISSIONS' => 'Do not copy permissions',
'NO_USERS' => 'You haven’t entered any users.',
- 'SPECIAL_GROUPS' => 'Predefined groups',
+ 'SPECIAL_GROUPS' => 'Pre-defined groups',
'SPECIAL_GROUPS_EXPLAIN' => 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings.',
'TOTAL_MEMBERS' => 'Members',
diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 2681dc32cc..193e8cf3a2 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -132,7 +132,7 @@ $help = array(
),
array(
0 => 'Why can’t I access a forum?',
- 1 => 'Some forums may be limited to certain users or groups. To view, read, post or perform another action you may need special authorization. Contact a moderator or board administrator to grant you access.'
+ 1 => 'Some forums may be limited to certain users or groups. To view, read, post or perform another action you may need special permissions. Contact a moderator or board administrator to grant you access.'
),
array(
0 => 'Why can’t I add attachments?',
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 8f37b52c09..180157d5e0 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -394,7 +394,7 @@ $lang = array_merge($lang, array(
'FILE_DIFF_NOT_ALLOWED' => 'File not allowed to be diffed.',
'FILE_USED' => 'Information used from', // Single file
'FILES_CONFLICT' => 'Conflict files',
- 'FILES_CONFLICT_EXPLAIN' => 'The following files are modified and do not represent the original files from the old version. phpBB determined that these files create conflicts if they are tried to be merged. Please investigate the conflicts and try to manually resolve them or continue the update choosing the preferred merging method. If you resolve the conflicts manually check the files again after you modified the them. You are also able to choose between the preferred merge method for every file. The first one will result in a file where the conflicting lines from your old file will be lost, the other one will result in loosing the changes from the newer file.',
+ 'FILES_CONFLICT_EXPLAIN' => 'The following files are modified and do not represent the original files from the old version. phpBB determined that these files create conflicts if they are tried to be merged. Please investigate the conflicts and try to manually resolve them or continue the update choosing the preferred merging method. If you resolve the conflicts manually check the files again after you modified them. You are also able to choose between the preferred merge method for every file. The first one will result in a file where the conflicting lines from your old file will be lost, the other one will result in loosing the changes from the newer file.',
'FILES_MODIFIED' => 'Modified files',
'FILES_MODIFIED_EXPLAIN' => 'The following files are modified and do not represent the original files from the old version. The updated file will be a merge between your modifications and the new file.',
'FILES_NEW' => 'New files',
@@ -485,16 +485,16 @@ $lang = array_merge($lang, array(
Release announcement
-
Please read the release announcement for the latest version before you continue your update process, it may contain useful information. It also contains full download links as well as the change log.
+
Please read the release announcement for the latest version before you continue your update process, it may contain useful information. It also contains full download links as well as the change log.
-
How to update your installation
+
How to update your installation with the Automatic Update Package
-
The recommended way of updating your installation only takes the following steps:
+
The recommended way of updating your installation listed here is only valid for the automatic update package. You are also able to update your installation using the methods listed within the INSTALL.html document. The steps for updating phpBB3 automatically are:
- You will then be guided through the update process. You will be notified after the update is complete.
+ You will then be guided through the update process. You will be notified once the update is complete.
',
+ 'UPDATE_INSTRUCTIONS_INCOMPLETE' => '
+
+
Incomplete update detected
+
+
phpBB detected an incomplete automatic update. Please make sure you followed every step within the automatic update tool. Below you will find the link again, or go directly to your install directory.
+ ',
'UPDATE_METHOD' => 'Update method',
'UPDATE_METHOD_EXPLAIN' => 'You are now able to choose your preferred update method. Using the FTP upload will present you with a form you need to enter your FTP account details into. With this method the files will be automatically moved to the new location and backups of the old files being created by appending .bak to the filename. If you choose to download the modified files you are able to unpack and upload them to their correct location manually later.',
'UPDATE_SUCCESS' => 'Update was successful',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index f4219feb61..6feb16c02c 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -54,6 +54,7 @@ $lang = array_merge($lang, array(
'EMAIL_TOPIC_EXPLAIN' => 'This message will be sent as plain text, do not include any HTML or BBCode. Please note that the topic information is already included in the message. The return address for this message will be set to your e-mail address.',
'EMPTY_ADDRESS_EMAIL' => 'You must provide a valid e-mail address for the recipient.',
'EMPTY_MESSAGE_EMAIL' => 'You must enter a message to be emailed.',
+ 'EMPTY_MESSAGE_IM' => 'You must enter a message to be send.',
'EMPTY_NAME_EMAIL' => 'You must enter the real name of the recipient.',
'EMPTY_SUBJECT_EMAIL' => 'You must specify a subject for the e-mail.',
'EQUAL_TO' => 'Equal to',
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 79b380b14f..4ff4b9be62 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -151,18 +151,19 @@ $lang = array_merge($lang, array(
'POLL_VOTE_CHANGE' => 'Allow re-voting',
'POLL_VOTE_CHANGE_EXPLAIN' => 'If enabled users are able to change their vote.',
'POSTED_ATTACHMENTS' => 'Posted attachments',
+ 'POST_APPROVAL_NOTIFY' => ' You will be notified when your post has been approved.',
'POST_CONFIRMATION' => 'Confirmation of post',
'POST_CONFIRM_EXPLAIN' => 'To prevent automated posts the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
'POST_DELETED' => 'This message has been deleted successfully.',
'POST_EDITED' => 'This message has been edited successfully.',
- 'POST_EDITED_MOD' => 'This message has been edited successfully, but it will need to be approved by a moderator before it is publicly viewable. You will be notified when your post has been approved.',
+ 'POST_EDITED_MOD' => 'This message has been edited successfully, but it will need to be approved by a moderator before it is publicly viewable.',
'POST_GLOBAL' => 'Global',
'POST_ICON' => 'Post icon',
'POST_NORMAL' => 'Normal',
'POST_REVIEW' => 'Post review',
'POST_REVIEW_EXPLAIN' => 'At least one new post has been made to this topic. You may wish to review your post in light of this.',
'POST_STORED' => 'This message has been posted successfully.',
- 'POST_STORED_MOD' => 'This message has been submitted successfully, but it will need to be approved by a moderator before it is publicly viewable. You will be notified when your post has been approved.',
+ 'POST_STORED_MOD' => 'This message has been submitted successfully, but it will need to be approved by a moderator before it is publicly viewable.',
'POST_TOPIC_AS' => 'Post topic as',
'PROGRESS_BAR' => 'Progress bar',
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index 720c39635e..641aa74efc 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -47,6 +47,8 @@ $lang = array_merge($lang, array(
'JUMP_TO_POST' => 'Jump to post',
+ 'LOGIN_EXPLAIN_EGOSEARCH' => 'The board requires you to be registered and logged in to view your own posts.',
+
'NO_KEYWORDS' => 'You must specify at least one word to search for. Each word must consist of at least %d characters and must not contain more than %d characters excluding wildcards.',
'NO_RECENT_SEARCHES' => 'No searches have been carried out recently.',
'NO_SEARCH' => 'Sorry but you are not permitted to use the search system.',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 304b9952d1..4c402d9b59 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -82,7 +82,7 @@ $lang = array_merge($lang, array(
'ATTACHMENTS_DELETED' => 'Attachments successfully deleted.',
'ATTACHMENT_DELETED' => 'Attachment successfully deleted.',
'AVATAR_CATEGORY' => 'Category',
- 'AVATAR_EXPLAIN' => 'Maximum dimensions; width %1$d pixels, height %2$d pixels, file size %3$dkB.',
+ 'AVATAR_EXPLAIN' => 'Maximum dimensions; width: %1$d pixels, height: %2$d pixels, file size: %3$dkB.',
'AVATAR_FEATURES_DISABLED' => 'The avatar functionality is currently disabled.',
'AVATAR_GALLERY' => 'Local gallery',
'AVATAR_GENERAL_UPLOAD_ERROR' => 'Could not upload avatar to %s.',
@@ -210,7 +210,7 @@ $lang = array_merge($lang, array(
'GLOBAL_ANNOUNCEMENT' => 'Global announcement',
'HIDE_ONLINE' => 'Hide my online status',
- 'HIDE_ONLINE_EXPLAIN' => 'Changing this setting to "No" won\'t become effective until your next visit to the board.',
+ 'HIDE_ONLINE_EXPLAIN' => 'Changing this setting won\'t become effective until your next visit to the board.',
'HOLD_NEW_MESSAGES' => 'Do not accept new messages (New messages will be held back until enough space is available)',
'HOLD_NEW_MESSAGES_SHORT' => 'New messages will be held back',
@@ -441,7 +441,7 @@ $lang = array_merge($lang, array(
'UNWATCH_MARKED' => 'Unwatch marked',
'UPLOAD_AVATAR_FILE' => 'Upload from your machine',
'UPLOAD_AVATAR_URL' => 'Upload from a URL',
- 'UPLOAD_AVATAR_URL_EXPLAIN' => 'Enter the URL of the location containing the image, it will be copied to this site.',
+ 'UPLOAD_AVATAR_URL_EXPLAIN' => 'Enter the URL of the location containing the image. The image will be copied to this site.',
'USERNAME_ALPHA_ONLY_EXPLAIN' => 'Username must be between %1$d and %2$d chars long and use only alphanumeric characters.',
'USERNAME_ALPHA_SPACERS_EXPLAIN'=> 'Username must be between %1$d and %2$d chars long and use alphanumeric, space or -+_[] characters.',
'USERNAME_ASCII_EXPLAIN' => 'Username must be between %1$d and %2$d chars long and use only ASCII characters, so no special symbols.',
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 76b6aa2d27..dfeaf9801f 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -328,7 +328,12 @@ switch ($mode)
include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
$subject = sprintf($user->lang['IM_JABBER_SUBJECT'], $user->data['username'], $config['server_name']);
- $message = request_var('message', '', true);
+ $message = trim(request_var('message', '', true));
+
+ if (empty($message))
+ {
+ trigger_error('EMPTY_MESSAGE_IM');
+ }
$messenger = new messenger(false);
@@ -717,7 +722,7 @@ switch ($mode)
}
else
{
- if (!$email || !preg_match('#^.*?@(.*?\.)?[a-z0-9\-]+\.[a-z]{2,4}$#i', $email))
+ if (!$email || !preg_match('/^' . get_preg_expression('email') . '$/i', $email))
{
$error[] = $user->lang['EMPTY_ADDRESS_EMAIL'];
}
@@ -934,16 +939,16 @@ switch ($mode)
$s_find_active_time .= '';
}
- $sql_where .= ($username) ? ' AND u.username_clean ' . $db->sql_like_expression(str_replace('*', '%', utf8_clean_string($username))) : '';
- $sql_where .= ($email) ? ' AND u.user_email ' . $db->sql_like_expression(str_replace('*', '%', $email)) . ' ' : '';
- $sql_where .= ($icq) ? ' AND u.user_icq ' . $db->sql_like_expression(str_replace('*', '%', $icq)) . ' ' : '';
- $sql_where .= ($aim) ? ' AND u.user_aim ' . $db->sql_like_expression(str_replace('*', '%', $aim)) . ' ' : '';
- $sql_where .= ($yahoo) ? ' AND u.user_yim ' . $db->sql_like_expression(str_replace('*', '%', $yahoo)) . ' ' : '';
- $sql_where .= ($msn) ? ' AND u.user_msnm ' . $db->sql_like_expression(str_replace('*', '%', $msn)) . ' ' : '';
- $sql_where .= ($jabber) ? ' AND u.user_jabber ' . $db->sql_like_expression(str_replace('*', '%', $jabber)) . ' ' : '';
+ $sql_where .= ($username) ? ' AND u.username_clean ' . $db->sql_like_expression(str_replace('*', $db->any_char, utf8_clean_string($username))) : '';
+ $sql_where .= ($email) ? ' AND u.user_email ' . $db->sql_like_expression(str_replace('*', $db->any_char, $email)) . ' ' : '';
+ $sql_where .= ($icq) ? ' AND u.user_icq ' . $db->sql_like_expression(str_replace('*', $db->any_char, $icq)) . ' ' : '';
+ $sql_where .= ($aim) ? ' AND u.user_aim ' . $db->sql_like_expression(str_replace('*', $db->any_char, $aim)) . ' ' : '';
+ $sql_where .= ($yahoo) ? ' AND u.user_yim ' . $db->sql_like_expression(str_replace('*', $db->any_char, $yahoo)) . ' ' : '';
+ $sql_where .= ($msn) ? ' AND u.user_msnm ' . $db->sql_like_expression(str_replace('*', $db->any_char, $msn)) . ' ' : '';
+ $sql_where .= ($jabber) ? ' AND u.user_jabber ' . $db->sql_like_expression(str_replace('*', $db->any_char, $jabber)) . ' ' : '';
$sql_where .= (is_numeric($count)) ? ' AND u.user_posts ' . $find_key_match[$count_select] . ' ' . (int) $count . ' ' : '';
$sql_where .= (sizeof($joined) > 1) ? " AND u.user_regdate " . $find_key_match[$joined_select] . ' ' . gmmktime(0, 0, 0, intval($joined[1]), intval($joined[2]), intval($joined[0])) : '';
- $sql_where .= (sizeof($active) > 1) ? " AND u.user_lastvisit " . $find_key_match[$active_select] . ' ' . gmmktime(0, 0, 0, $active[1], intval($active[2]), intval($active[0])) : '';
+ $sql_where .= ($auth->acl_get('u_viewonline') && sizeof($active) > 1) ? " AND u.user_lastvisit " . $find_key_match[$active_select] . ' ' . gmmktime(0, 0, 0, $active[1], intval($active[2]), intval($active[0])) : '';
$sql_where .= ($search_group_id) ? " AND u.user_id = ug.user_id AND ug.group_id = $search_group_id AND ug.user_pending = 0 " : '';
if ($search_group_id)
@@ -1387,11 +1392,12 @@ switch ($mode)
'U_SORT_AIM' => $sort_url . '&sk=h&sd=' . (($sort_key == 'h' && $sort_dir == 'a') ? 'd' : 'a'),
'U_SORT_MSN' => $sort_url . '&sk=i&sd=' . (($sort_key == 'i' && $sort_dir == 'a') ? 'd' : 'a'),
'U_SORT_YIM' => $sort_url . '&sk=j&sd=' . (($sort_key == 'j' && $sort_dir == 'a') ? 'd' : 'a'),
- 'U_SORT_ACTIVE' => $sort_url . '&sk=l&sd=' . (($sort_key == 'l' && $sort_dir == 'a') ? 'd' : 'a'),
+ 'U_SORT_ACTIVE' => ($auth->acl_get('u_viewonline')) ? $sort_url . '&sk=l&sd=' . (($sort_key == 'l' && $sort_dir == 'a') ? 'd' : 'a') : '',
'U_SORT_RANK' => $sort_url . '&sk=m&sd=' . (($sort_key == 'm' && $sort_dir == 'a') ? 'd' : 'a'),
'U_LIST_CHAR' => $sort_url . '&sk=a&sd=' . (($sort_key == 'l' && $sort_dir == 'a') ? 'd' : 'a'),
'S_SHOW_GROUP' => ($mode == 'group') ? true : false,
+ 'S_VIEWONLINE' => $auth->acl_get('u_viewonline'),
'S_MODE_SELECT' => $s_sort_key,
'S_ORDER_SELECT' => $s_sort_dir,
'S_CHAR_OPTIONS' => $s_char_options,
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 675b390672..403eea5418 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -164,6 +164,10 @@ if ($post_data['forum_password'])
}
// Check permissions
+if ($user->data['is_bot'])
+{
+ redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
+}
// Is the user able to read within this forum?
if (!$auth->acl_get('f_read', $forum_id))
@@ -716,7 +720,7 @@ if ($submit || $preview || $refresh)
}
// Validate username
- if (($post_data['username'] && !$user->data['is_registered']) || ($mode == 'edit' && $post_data['username'] && $post_data['post_username'] && $post_data['post_username'] != $post_data['username']))
+ if (($post_data['username'] && !$user->data['is_registered']) || ($mode == 'edit' && $post_data['poster_id'] == ANONYMOUS && $post_data['username'] && $post_data['post_username'] && $post_data['post_username'] != $post_data['username']))
{
include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
@@ -977,6 +981,7 @@ if ($submit || $preview || $refresh)
if ($mode == 'edit')
{
$data['topic_replies_real'] = $post_data['topic_replies_real'];
+ $data['topic_replies'] = $post_data['topic_replies'];
}
unset($message_parser);
@@ -989,6 +994,7 @@ if ($submit || $preview || $refresh)
{
meta_refresh(10, $redirect_url);
$message = ($mode == 'edit') ? $user->lang['POST_EDITED_MOD'] : $user->lang['POST_STORED_MOD'];
+ $message .= (($user->data['user_id'] == ANONYMOUS) ? '' : $user->lang['POST_APPROVAL_NOTIFY']);
}
else
{
diff --git a/phpBB/search.php b/phpBB/search.php
index cbc5b6732f..0693b32569 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -85,6 +85,11 @@ if ($keywords || $author || $author_id || $search_id || $submit)
if ($search_id == 'egosearch')
{
$author_id = $user->data['user_id'];
+
+ if ($user->data['user_id'] == ANONYMOUS)
+ {
+ login_box('', $user->lang['LOGIN_EXPLAIN_EGOSEARCH']);
+ }
}
// If we are looking for authors get their ids
diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js
index 38dd77bdbe..80dd20da99 100644
--- a/phpBB/styles/prosilver/template/editor.js
+++ b/phpBB/styles/prosilver/template/editor.js
@@ -48,7 +48,7 @@ function initInsertions()
{
textarea.focus();
baseHeight = doc.selection.createRange().duplicate().boundingHeight;
- document.body.focus();
+ // document.body.focus();
}
}
@@ -74,7 +74,7 @@ function bbstyle(bbnumber)
function bbfontstyle(bbopen, bbclose)
{
theSelection = false;
-
+
var textarea = document.forms[form_name].elements[text_name];
textarea.focus();
@@ -325,7 +325,7 @@ function colorPalette(dir, width, height)
for (b = 0; b < 5; b++)
{
color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
- document.write('
');
document.writeln('