aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/sami-all.conf.php1
-rw-r--r--phpBB/docs/INSTALL.html2
-rw-r--r--phpBB/docs/events.md8
-rw-r--r--phpBB/includes/acp/acp_board.php2
-rw-r--r--phpBB/includes/functions_admin.php43
-rw-r--r--phpBB/includes/functions_posting.php2
-rw-r--r--phpBB/install/install_install.php2
-rw-r--r--phpBB/language/en/acp/attachments.php4
-rw-r--r--phpBB/language/en/acp/board.php1
-rw-r--r--phpBB/language/en/install.php4
-rw-r--r--phpBB/language/en/search_ignore_words.php271
-rw-r--r--phpBB/language/en/search_synonyms.php191
-rw-r--r--phpBB/phpbb/avatar/driver/gravatar.php4
-rw-r--r--phpBB/phpbb/avatar/driver/remote.php4
-rw-r--r--phpBB/phpbb/content_visibility.php10
-rw-r--r--phpBB/phpbb/search/base.php46
-rw-r--r--phpBB/search.php21
-rw-r--r--phpBB/styles/prosilver/template/mcp_move.html4
-rw-r--r--phpBB/styles/subsilver2/template/mcp_move.html8
-rw-r--r--phpBB/viewforum.php32
20 files changed, 121 insertions, 539 deletions
diff --git a/build/sami-all.conf.php b/build/sami-all.conf.php
index 9c10209e8b..4bf812eb02 100644
--- a/build/sami-all.conf.php
+++ b/build/sami-all.conf.php
@@ -25,6 +25,7 @@ $config['versions'] = Sami\Version\GitVersionCollection::create(__DIR__ . '/../'
*/
->add('3.0.x')
->add('3.1.x')
+ ->add('3.2.x')
->add('master')
;
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
index 333d367aa7..9f8bbe74b8 100644
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -160,7 +160,7 @@
<li>zlib Compression support</li>
<li>Remote FTP support</li>
<li>XML support</li>
- <li>Imagemagick support</li>
+ <li>ImageMagick support</li>
<li>GD Support</li>
</ul>
</li>
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 5a7b87bf86..1fe8b915f1 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -843,6 +843,14 @@ mcp_front_latest_unapproved_before
* Since: 3.1.3-RC1
* Purpose: Add content before latest unapproved posts list
+mcp_move_before
+===
+* Locations:
+ + styles/prosilver/template/mcp_move.html
+ + styles/subsilver2/template/mcp_move.html
+* Since: 3.1.10-RC1
+* Purpose: Add content before move topic/post form
+
mcp_post_additional_options
===
* Locations:
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index cec621e89d..e004d2e81f 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -449,7 +449,7 @@ class acp_board
'legend2' => 'SMTP_SETTINGS',
'smtp_delivery' => array('lang' => 'USE_SMTP', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
- 'smtp_host' => array('lang' => 'SMTP_SERVER', 'validate' => 'string', 'type' => 'text:25:50', 'explain' => false),
+ 'smtp_host' => array('lang' => 'SMTP_SERVER', 'validate' => 'string', 'type' => 'text:25:50', 'explain' => true),
'smtp_port' => array('lang' => 'SMTP_PORT', 'validate' => 'int:0:99999', 'type' => 'number:0:99999', 'explain' => true),
'smtp_auth_method' => array('lang' => 'SMTP_AUTH_METHOD', 'validate' => 'string', 'type' => 'select', 'method' => 'mail_auth_select', 'explain' => true),
'smtp_username' => array('lang' => 'SMTP_USERNAME', 'validate' => 'string', 'type' => 'text:25:255', 'explain' => true),
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 4ecb7b9354..9c543eaac6 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -201,7 +201,7 @@ function group_select_options($group_id, $exclude_ids = false, $manage_founder =
*/
function get_forum_list($acl_list = 'f_list', $id_only = true, $postable_only = false, $no_cache = false)
{
- global $db, $auth;
+ global $db, $auth, $phpbb_dispatcher;
static $forum_rows;
if (!isset($forum_rows))
@@ -256,6 +256,16 @@ function get_forum_list($acl_list = 'f_list', $id_only = true, $postable_only =
}
}
+ /**
+ * Modify the forum list data
+ *
+ * @event core.get_forum_list_modify_data
+ * @var array rowset Array with the forum list data
+ * @since 3.1.10-RC1
+ */
+ $vars = array('rowset');
+ extract($phpbb_dispatcher->trigger_event('core.get_forum_list_modify_data', compact($vars)));
+
return $rowset;
}
@@ -2531,7 +2541,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
/**
* Prune function
*/
-function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync = true)
+function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync = true, $prune_limit = 0)
{
global $db, $phpbb_dispatcher;
@@ -2583,9 +2593,19 @@ function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync
* @var int prune_flags The prune flags
* @var bool auto_sync Whether or not to perform auto sync
* @var string sql_and SQL text appended to where clause
+ * @var int prune_limit The prune limit
* @since 3.1.3-RC1
+ * @changed 3.1.10-RC1 Added prune_limit
*/
- $vars = array('forum_id', 'prune_mode', 'prune_date', 'prune_flags', 'auto_sync', 'sql_and');
+ $vars = array(
+ 'forum_id',
+ 'prune_mode',
+ 'prune_date',
+ 'prune_flags',
+ 'auto_sync',
+ 'sql_and',
+ 'prune_limit',
+ );
extract($phpbb_dispatcher->trigger_event('core.prune_sql', compact($vars)));
$sql = 'SELECT topic_id
@@ -2593,7 +2613,7 @@ function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync
WHERE ' . $db->sql_in_set('forum_id', $forum_id) . "
AND poll_start = 0
$sql_and";
- $result = $db->sql_query($sql);
+ $result = $db->sql_query_limit($sql, $prune_limit);
$topic_list = array();
while ($row = $db->sql_fetchrow($result))
@@ -2610,7 +2630,7 @@ function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync
AND poll_start > 0
AND poll_last_vote < $prune_date
$sql_and";
- $result = $db->sql_query($sql);
+ $result = $db->sql_query_limit($sql, $prune_limit);
while ($row = $db->sql_fetchrow($result))
{
@@ -2643,12 +2663,15 @@ function auto_prune($forum_id, $prune_mode, $prune_flags, $prune_days, $prune_fr
$prune_date = time() - ($prune_days * 86400);
$next_prune = time() + ($prune_freq * 86400);
- prune($forum_id, $prune_mode, $prune_date, $prune_flags, true);
+ $result = prune($forum_id, $prune_mode, $prune_date, $prune_flags, true, 300);
- $sql = 'UPDATE ' . FORUMS_TABLE . "
- SET prune_next = $next_prune
- WHERE forum_id = $forum_id";
- $db->sql_query($sql);
+ if ($result['topics'] == 0 && $result['posts'] == 0)
+ {
+ $sql = 'UPDATE ' . FORUMS_TABLE . "
+ SET prune_next = $next_prune
+ WHERE forum_id = $forum_id";
+ $db->sql_query($sql);
+ }
add_log('admin', 'LOG_AUTO_PRUNE', $row['forum_name']);
}
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index b2713fef07..57c68d4935 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -702,7 +702,7 @@ function create_thumbnail($source, $destination, $mimetype)
$used_imagick = false;
- // Only use imagemagick if defined and the passthru function not disabled
+ // Only use ImageMagick if defined and the passthru function not disabled
if ($config['img_imagick'] && function_exists('passthru'))
{
if (substr($config['img_imagick'], -1) !== '/')
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 5b818f9475..bb3a74ee5e 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -404,7 +404,7 @@ class install_install extends module
));
}
- // Can we find Imagemagick anywhere on the system?
+ // Can we find ImageMagick anywhere on the system?
$exe = (DIRECTORY_SEPARATOR == '\\') ? '.exe' : '';
$magic_home = getenv('MAGICK_HOME');
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index cf2f0a45d2..7d3d93d693 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -117,7 +117,7 @@ $lang = array_merge($lang, array(
'IMAGE_LINK_SIZE' => 'Image link dimensions',
'IMAGE_LINK_SIZE_EXPLAIN' => 'Display image attachment as an inline text link if image is larger than this. To disable this behaviour, set the values to 0px by 0px.',
- 'IMAGICK_PATH' => 'Imagemagick path',
+ 'IMAGICK_PATH' => 'ImageMagick path',
'IMAGICK_PATH_EXPLAIN' => 'Full path to the imagemagick convert application, e.g. <samp>/usr/bin/</samp>.',
'MAX_ATTACHMENTS' => 'Maximum number of attachments per post',
@@ -153,7 +153,7 @@ $lang = array_merge($lang, array(
'REMOVE_DISALLOWED_IPS' => 'Remove or un-exclude <em>disallowed</em> IPs/hostnames',
'RESYNC_FILES_STATS_CONFIRM' => 'Are you sure you wish to resynchronise file statistics?',
- 'SEARCH_IMAGICK' => 'Search for Imagemagick',
+ 'SEARCH_IMAGICK' => 'Search for ImageMagick',
'SECURE_ALLOW_DENY' => 'Allow/Deny list',
'SECURE_ALLOW_DENY_EXPLAIN' => 'Change the default behaviour when secure downloads are enabled of the Allow/Deny list to that of a <strong>whitelist</strong> (Allow) or a <strong>blacklist</strong> (Deny).',
'SECURE_DOWNLOADS' => 'Enable secure downloads',
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 8d6c1c141d..8b4db6a061 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -570,6 +570,7 @@ $lang = array_merge($lang, array(
'SMTP_PORT' => 'SMTP server port',
'SMTP_PORT_EXPLAIN' => 'Only change this if you know your SMTP server is on a different port.',
'SMTP_SERVER' => 'SMTP server address',
+ 'SMTP_SERVER_EXPLAIN' => 'Note that you have to provide the protocol that your server uses. If you are using SSL, this has to be "ssl://your.mailserver.com"',
'SMTP_SETTINGS' => 'SMTP settings',
'SMTP_USERNAME' => 'SMTP username',
'SMTP_USERNAME_EXPLAIN' => 'Only enter a username if your SMTP server requires it.',
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 5a799ed548..2542066596 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -44,7 +44,7 @@ $lang = array_merge($lang, array(
'ADMIN_TEST' => 'Check administrator settings',
'ADMIN_USERNAME' => 'Administrator username',
'ADMIN_USERNAME_EXPLAIN' => 'Please enter a username between 3 and 20 characters in length.',
- 'APP_MAGICK' => 'Imagemagick support [ Attachments ]',
+ 'APP_MAGICK' => 'ImageMagick support [ Attachments ]',
'AUTHOR_NOTES' => 'Author notes<br />» %s',
'AVAILABLE' => 'Available',
'AVAILABLE_CONVERTORS' => 'Available convertors',
@@ -282,7 +282,7 @@ $lang = array_merge($lang, array(
'NOT_UNDERSTAND' => 'Could not understand %s #%d, table %s (“%s”)',
'NO_CONVERTORS' => 'No convertors are available for use.',
'NO_CONVERT_SPECIFIED' => 'No convertor specified.',
- 'NO_LOCATION' => 'Cannot determine location. If you know Imagemagick is installed, you may specify the location later within your administration control panel',
+ 'NO_LOCATION' => 'Cannot determine location. If you know ImageMagick is installed, you may specify the location later within your administration control panel',
'NO_TABLES_FOUND' => 'No tables found.',
'OVERVIEW_BODY' => 'Welcome to phpBB3!<br /><br />phpBB® is the most widely used open source bulletin board solution in the world. phpBB3 is the latest installment in a package line started in 2000. Like its predecessors, phpBB3 is feature-rich, user-friendly, and fully supported by the phpBB Team. phpBB3 greatly improves on what made phpBB2 popular, and adds commonly requested features that were not present in previous versions. We hope it exceeds your expectations.<br /><br />This installation system will guide you through installing phpBB3, updating to the latest version of phpBB3 from past releases, as well as converting to phpBB3 from a different discussion board system (including phpBB2). For more information, we encourage you to read <a href="../docs/INSTALL.html">the installation guide</a>.<br /><br />To read the phpBB3 license or learn about obtaining support and our stance on it, please select the respective options from the side menu. To continue, please select the appropriate tab above.',
diff --git a/phpBB/language/en/search_ignore_words.php b/phpBB/language/en/search_ignore_words.php
deleted file mode 100644
index 3db209d120..0000000000
--- a/phpBB/language/en/search_ignore_words.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-if (!defined('IN_PHPBB'))
-{
- exit;
-}
-
-$words = array(
- 'a',
- 'about',
- 'after',
- 'ago',
- 'all',
- 'almost',
- 'along',
- 'alot',
- 'also',
- 'am',
- 'an',
- 'and',
- 'answer',
- 'any',
- 'anybody',
- 'anybodys',
- 'anywhere',
- 'are',
- 'arent',
- 'around',
- 'as',
- 'ask',
- 'askd',
- 'at',
- 'bad',
- 'be',
- 'because',
- 'been',
- 'before',
- 'being',
- 'best',
- 'better',
- 'between',
- 'big',
- 'btw',
- 'but',
- 'by',
- 'can',
- 'cant',
- 'come',
- 'could',
- 'couldnt',
- 'day',
- 'days',
- 'days',
- 'did',
- 'didnt',
- 'do',
- 'does',
- 'doesnt',
- 'dont',
- 'down',
- 'each',
- 'etc',
- 'either',
- 'else',
- 'even',
- 'ever',
- 'every',
- 'everybody',
- 'everybodys',
- 'everyone',
- 'far',
- 'find',
- 'for',
- 'found',
- 'from',
- 'get',
- 'go',
- 'going',
- 'gone',
- 'good',
- 'got',
- 'gotten',
- 'had',
- 'has',
- 'have',
- 'havent',
- 'having',
- 'her',
- 'here',
- 'hers',
- 'him',
- 'his',
- 'home',
- 'how',
- 'hows',
- 'href',
- 'I',
- 'Ive',
- 'if',
- 'in',
- 'ini',
- 'into',
- 'is',
- 'isnt',
- 'it',
- 'its',
- 'its',
- 'just',
- 'know',
- 'large',
- 'less',
- 'like',
- 'liked',
- 'little',
- 'looking',
- 'look',
- 'looked',
- 'looking',
- 'lot',
- 'maybe',
- 'many',
- 'me',
- 'more',
- 'most',
- 'much',
- 'must',
- 'mustnt',
- 'my',
- 'near',
- 'need',
- 'never',
- 'new',
- 'news',
- 'no',
- 'none',
- 'not',
- 'nothing',
- 'now',
- 'of',
- 'off',
- 'often',
- 'old',
- 'on',
- 'once',
- 'only',
- 'oops',
- 'or',
- 'other',
- 'our',
- 'ours',
- 'out',
- 'over',
- 'page',
- 'please',
- 'put',
- 'question',
- 'questions',
- 'questioned',
- 'quote',
- 'rather',
- 'really',
- 'recent',
- 'said',
- 'saw',
- 'say',
- 'says',
- 'she',
- 'see',
- 'sees',
- 'should',
- 'sites',
- 'small',
- 'so',
- 'some',
- 'something',
- 'sometime',
- 'somewhere',
- 'soon',
- 'take',
- 'than',
- 'true',
- 'thank',
- 'that',
- 'thatd',
- 'thats',
- 'the',
- 'their',
- 'theirs',
- 'theres',
- 'theirs',
- 'them',
- 'then',
- 'there',
- 'these',
- 'they',
- 'theyll',
- 'theyd',
- 'theyre',
- 'this',
- 'those',
- 'though',
- 'through',
- 'thus',
- 'time',
- 'times',
- 'to',
- 'too',
- 'under',
- 'until',
- 'untrue',
- 'up',
- 'upon',
- 'use',
- 'users',
- 'version',
- 'very',
- 'via',
- 'want',
- 'was',
- 'way',
- 'we',
- 'well',
- 'went',
- 'were',
- 'werent',
- 'what',
- 'when',
- 'where',
- 'which',
- 'who',
- 'whom',
- 'whose',
- 'why',
- 'wide',
- 'will',
- 'with',
- 'within',
- 'without',
- 'wont',
- 'world',
- 'worse',
- 'worst',
- 'would',
- 'wrote',
- 'www',
- 'yes',
- 'yet',
- 'you',
- 'youd',
- 'youll',
- 'your',
- 'youre',
- 'yours',
- 'AFAIK',
- 'IIRC',
- 'LOL',
- 'ROTF',
- 'ROTFLMAO',
- 'YMMV',
-);
diff --git a/phpBB/language/en/search_synonyms.php b/phpBB/language/en/search_synonyms.php
deleted file mode 100644
index 6a8c257f0b..0000000000
--- a/phpBB/language/en/search_synonyms.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-if (!defined('IN_PHPBB'))
-{
- exit;
-}
-
-$synonyms = array(
- 'abcense' => 'absence',
- 'abridgement' => 'abridgment',
- 'accomodate' => 'accommodate',
- 'acknowledgment' => 'acknowledgement',
- 'airplane' => 'aeroplane',
- 'allright' => 'alright ',
- 'andy' => 'andrew',
- 'anemia' => 'anaemia',
- 'anemic' => 'anaemic',
- 'anesthesia' => 'anaesthesia',
- 'apologize' => 'apologise',
- 'archean' => 'archaean',
- 'archeology' => 'archaeology',
- 'archeozoic' => 'archaeozoic',
- 'armor' => 'armour',
- 'artic' => 'arctic',
- 'attachment' => 'attachement',
- 'attendence' => 'attendance',
-
- 'barbecue' => 'barbeque',
- 'behavior' => 'behaviour',
- 'biassed' => 'biased',
- 'biol' => 'biology',
- 'buletin' => 'bulletin',
-
- 'calender' => 'calendar',
- 'canceled' => 'cancelled',
- 'car' => 'automobile',
- 'catalog' => 'catalogue',
- 'cenozoic' => 'caenozoic',
- 'center' => 'centre',
- 'check' => 'cheque',
- 'color' => 'colour',
- 'comission' => 'commission',
- 'comittee' => 'committee',
- 'commitee' => 'committee',
- 'conceed' => 'concede',
- 'creating' => 'createing',
- 'curiculum' => 'curriculum',
-
- 'defense' => 'defence',
- 'develope' => 'develop',
- 'discription' => 'description',
- 'dulness' => 'dullness',
-
- 'encyclopedia' => 'encyclopaedia',
- 'enroll' => 'enrol',
- 'esthetic' => 'aesthetic',
- 'etiology' => 'aetiology',
- 'exhorbitant' => 'exorbitant',
- 'exhuberant' => 'exuberant',
- 'existance' => 'existence',
-
- 'favorite' => 'favourite',
- 'fetus' => 'foetus',
- 'ficticious' => 'fictitious',
- 'flavor' => 'flavour',
- 'flourescent' => 'fluorescent',
- 'foriegn' => 'foreign',
- 'fourty' => 'forty',
-
- 'gage' => 'gauge',
- 'geneology' => 'genealogy',
- 'grammer' => 'grammar',
- 'gray' => 'grey',
- 'guerilla' => 'guerrilla',
- 'gynecology' => 'gynaecology',
-
- 'harbor' => 'harbour',
- 'heighth' => 'height',
- 'hemaglobin' => 'haemaglobin',
- 'hematin' => 'haematin',
- 'hematite' => 'haematite',
- 'hematology' => 'haematology',
- 'honor' => 'honour',
-
- 'innoculate' => 'inoculate',
- 'installment' => 'instalment',
- 'irrelevent' => 'irrelevant',
- 'irrevelant' => 'irrelevant',
-
- 'jeweler' => 'jeweller',
- 'judgment' => 'judgement',
-
- 'labeled' => 'labelled',
- 'labor' => 'labour',
- 'laborer' => 'labourer',
- 'laborers' => 'labourers',
- 'laboring' => 'labouring',
- 'licence' => 'license',
- 'liesure' => 'leisure',
- 'liquify' => 'liquefy',
-
- 'maintainance' => 'maintenance',
- 'maintenence' => 'maintenance',
- 'medieval' => 'mediaeval',
- 'meter' => 'metre',
- 'milage' => 'mileage',
- 'millipede' => 'millepede',
- 'miscelaneous' => 'miscellaneous',
- 'morgage' => 'mortgage',
-
- 'noticable' => 'noticeable',
-
- 'occurence' => 'occurrence',
- 'offense' => 'offence',
- 'ommision' => 'omission',
- 'ommission' => 'omission',
- 'optimize' => 'optimise',
- 'organize' => 'organise',
-
- 'pajamas' => 'pyjamas',
- 'paleography' => 'palaeography',
- 'paleolithic' => 'palaeolithic',
- 'paleontological' => 'palaeontological',
- 'paleontologist' => 'palaeontologist',
- 'paleontology' => 'palaeontology',
- 'paleozoic' => 'palaeozoic',
- 'pamplet' => 'pamphlet',
- 'paralell' => 'parallel',
- 'parl' => 'parliament',
- 'parlt' => 'parliament',
- 'pediatric' => 'paediatric',
- 'pediatrician' => 'paediatrician',
- 'pediatrics' => 'paediatrics',
- 'pedodontia' => 'paedodontia',
- 'pedodontics' => 'paedodontics',
- 'personel' => 'personnel',
- 'practise' => 'practice',
- 'program' => 'programme',
- 'psych' => 'psychology',
-
- 'questionaire' => 'questionnaire',
-
- 'rarify' => 'rarefy',
- 'reccomend' => 'recommend',
- 'recieve' => 'receive',
- 'resistence' => 'resistance',
- 'restaraunt' => 'restaurant',
-
- 'savior' => 'saviour',
- 'sep' => 'september',
- 'seperate' => 'separate',
- 'sept' => 'september',
- 'sieze' => 'seize',
- 'summarize' => 'summarise',
- 'summerize' => 'summarise',
- 'superceed' => 'supercede',
- 'superintendant' => 'superintendent',
- 'supersede' => 'supercede',
- 'suprise' => 'surprise',
- 'surprize' => 'surprise',
- 'synchronise' => 'synchronize',
-
- 'temperary' => 'temporary',
- 'theater' => 'theatre',
- 'threshhold' => 'threshold',
- 'transfered' => 'transferred',
- 'truely' => 'truly',
- 'truley' => 'truly',
-
- 'useable' => 'usable',
-
- 'valor' => 'valour',
- 'vigor' => 'vigour',
- 'vol' => 'volume',
-
- 'whack' => 'wack',
- 'withold' => 'withhold',
-
- 'yeild' => 'yield',
-);
diff --git a/phpBB/phpbb/avatar/driver/gravatar.php b/phpBB/phpbb/avatar/driver/gravatar.php
index bb4977c30c..7a43b55852 100644
--- a/phpBB/phpbb/avatar/driver/gravatar.php
+++ b/phpBB/phpbb/avatar/driver/gravatar.php
@@ -52,8 +52,8 @@ class gravatar extends \phpbb\avatar\driver\driver
public function prepare_form($request, $template, $user, $row, &$error)
{
$template->assign_vars(array(
- 'AVATAR_GRAVATAR_WIDTH' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_width']) ? $row['avatar_width'] : $request->variable('avatar_gravatar_width', 0),
- 'AVATAR_GRAVATAR_HEIGHT' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_height']) ? $row['avatar_height'] : $request->variable('avatar_gravatar_width', 0),
+ 'AVATAR_GRAVATAR_WIDTH' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_width']) ? $row['avatar_width'] : $request->variable('avatar_gravatar_width', ''),
+ 'AVATAR_GRAVATAR_HEIGHT' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_height']) ? $row['avatar_height'] : $request->variable('avatar_gravatar_width', ''),
'AVATAR_GRAVATAR_EMAIL' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar']) ? $row['avatar'] : '',
));
diff --git a/phpBB/phpbb/avatar/driver/remote.php b/phpBB/phpbb/avatar/driver/remote.php
index 4b0ee3f06f..bec54897b2 100644
--- a/phpBB/phpbb/avatar/driver/remote.php
+++ b/phpBB/phpbb/avatar/driver/remote.php
@@ -36,8 +36,8 @@ class remote extends \phpbb\avatar\driver\driver
public function prepare_form($request, $template, $user, $row, &$error)
{
$template->assign_vars(array(
- 'AVATAR_REMOTE_WIDTH' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_width']) ? $row['avatar_width'] : $request->variable('avatar_remote_width', 0),
- 'AVATAR_REMOTE_HEIGHT' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_height']) ? $row['avatar_height'] : $request->variable('avatar_remote_width', 0),
+ 'AVATAR_REMOTE_WIDTH' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_width']) ? $row['avatar_width'] : $request->variable('avatar_remote_width', ''),
+ 'AVATAR_REMOTE_HEIGHT' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_height']) ? $row['avatar_height'] : $request->variable('avatar_remote_width', ''),
'AVATAR_REMOTE_URL' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar']) ? $row['avatar'] : '',
));
diff --git a/phpBB/phpbb/content_visibility.php b/phpBB/phpbb/content_visibility.php
index 0ba0489cb7..147b8ebbff 100644
--- a/phpBB/phpbb/content_visibility.php
+++ b/phpBB/phpbb/content_visibility.php
@@ -417,6 +417,11 @@ class content_visibility
return array();
}
+ if (!function_exists('truncate_string'))
+ {
+ include($this->phpbb_root_path . 'includes/functions_content.' . $this->php_ext);
+ }
+
$data = array(
'post_visibility' => (int) $visibility,
'post_delete_user' => (int) $user_id,
@@ -628,6 +633,11 @@ class content_visibility
}
}
+ if (!function_exists('truncate_string'))
+ {
+ include($this->phpbb_root_path . 'includes/functions_content.' . $this->php_ext);
+ }
+
// Note, we do not set a reason for the posts, just for the topic
$data = array(
'topic_visibility' => (int) $visibility,
diff --git a/phpBB/phpbb/search/base.php b/phpBB/phpbb/search/base.php
index 30781975d8..d9313dddab 100644
--- a/phpBB/phpbb/search/base.php
+++ b/phpBB/phpbb/search/base.php
@@ -37,52 +37,6 @@ class base
}
/**
- * Retrieves a language dependend list of words that should be ignored by the search
- */
- function get_ignore_words()
- {
- if (!sizeof($this->ignore_words))
- {
- global $user, $phpEx;
-
- $words = array();
-
- if (file_exists("{$user->lang_path}{$user->lang_name}/search_ignore_words.$phpEx"))
- {
- // include the file containing ignore words
- include("{$user->lang_path}{$user->lang_name}/search_ignore_words.$phpEx");
- }
-
- $this->ignore_words = $words;
- unset($words);
- }
- }
-
- /**
- * Stores a list of synonyms that should be replaced in $this->match_synonym and $this->replace_synonym and caches them
- */
- function get_synonyms()
- {
- if (!sizeof($this->match_synonym))
- {
- global $user, $phpEx;
-
- $synonyms = array();
-
- if (file_exists("{$user->lang_path}{$user->lang_name}/search_synonyms.$phpEx"))
- {
- // include the file containing synonyms
- include("{$user->lang_path}{$user->lang_name}/search_synonyms.$phpEx");
- }
-
- $this->match_synonym = array_keys($synonyms);
- $this->replace_synonym = array_values($synonyms);
-
- unset($synonyms);
- }
- }
-
- /**
* Retrieves cached search results
*
* @param string $search_key an md5 string generated from all the passed search options to identify the results
diff --git a/phpBB/search.php b/phpBB/search.php
index 3fa3b61c3c..a0380590c1 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -1254,6 +1254,7 @@ if ($keywords || $author || $author_id || $search_id || $submit)
}
// Search forum
+$rowset = array();
$s_forums = '';
$sql = 'SELECT f.forum_id, f.forum_name, f.parent_id, f.forum_type, f.left_id, f.right_id, f.forum_password, f.enable_indexing, fa.user_id
FROM ' . FORUMS_TABLE . ' f
@@ -1262,11 +1263,27 @@ $sql = 'SELECT f.forum_id, f.forum_name, f.parent_id, f.forum_type, f.left_id, f
ORDER BY f.left_id ASC";
$result = $db->sql_query($sql);
+while ($row = $db->sql_fetchrow($result))
+{
+ $rowset[(int) $row['forum_id']] = $row;
+}
+$db->sql_freeresult($result);
+
$right = $cat_right = $padding_inc = 0;
$padding = $forum_list = $holding = '';
$pad_store = array('0' => '');
-while ($row = $db->sql_fetchrow($result))
+/**
+* Modify the forum select list for advanced search page
+*
+* @event core.search_modify_forum_select_list
+* @var array rowset Array with the forums list data
+* @since 3.1.10-RC1
+*/
+$vars = array('rowset');
+extract($phpbb_dispatcher->trigger_event('core.search_modify_forum_select_list', compact($vars)));
+
+foreach ($rowset as $row)
{
if ($row['forum_type'] == FORUM_CAT && ($row['left_id'] + 1 == $row['right_id']))
{
@@ -1338,8 +1355,8 @@ if ($holding)
$s_forums .= $holding;
}
-$db->sql_freeresult($result);
unset($pad_store);
+unset($rowset);
if (!$s_forums)
{
diff --git a/phpBB/styles/prosilver/template/mcp_move.html b/phpBB/styles/prosilver/template/mcp_move.html
index d028fffeb4..45a9ae83bc 100644
--- a/phpBB/styles/prosilver/template/mcp_move.html
+++ b/phpBB/styles/prosilver/template/mcp_move.html
@@ -31,6 +31,8 @@
<!-- INCLUDE overall_header.html -->
+<!-- EVENT mcp_move_before -->
+
<form id="confirm" action="{S_CONFIRM_ACTION}" method="post">
<div class="panel">
@@ -54,7 +56,7 @@
</fieldset>
<fieldset class="submit-buttons">
- {S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="button1" />&nbsp;
+ {S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="button1" />&nbsp;
<input type="submit" name="cancel" value="{L_NO}" class="button2" />
{S_FORM_TOKEN}
</fieldset>
diff --git a/phpBB/styles/subsilver2/template/mcp_move.html b/phpBB/styles/subsilver2/template/mcp_move.html
index b8958187e6..429fee7e38 100644
--- a/phpBB/styles/subsilver2/template/mcp_move.html
+++ b/phpBB/styles/subsilver2/template/mcp_move.html
@@ -1,9 +1,11 @@
<!-- INCLUDE overall_header.html -->
+<!-- EVENT mcp_move_before -->
+
<div id="pagecontent">
<form name="confirm" action="{S_CONFIRM_ACTION}" method="post">
-
+
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<th>{MESSAGE_TITLE}</th>
@@ -32,9 +34,9 @@
</td>
</tr>
</table>
- {S_FORM_TOKEN}
+ {S_FORM_TOKEN}
</form>
-
+
</div>
<br clear="all" />
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index ccf9c3cd5c..e0cc9ba512 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -492,6 +492,28 @@ if ($forum_data['forum_type'] == FORUM_POST)
'ORDER_BY' => 't.topic_time DESC',
);
+
+ /**
+ * Event to modify the SQL query before the announcement topic ids data is retrieved
+ *
+ * @event core.viewforum_get_announcement_topic_ids_data
+ * @var array forum_data Data about the forum
+ * @var array g_forum_ary Global announcement forums array
+ * @var array sql_anounce_array SQL announcement array
+ * @var array sql_ary SQL query array to get the announcement topic ids data
+ * @var int forum_id The forum ID
+ *
+ * @since 3.1.10-RC1
+ */
+ $vars = array(
+ 'forum_data',
+ 'g_forum_ary',
+ 'sql_anounce_array',
+ 'sql_ary',
+ 'forum_id',
+ );
+ extract($phpbb_dispatcher->trigger_event('core.viewforum_get_announcement_topic_ids_data', compact($vars)));
+
$sql = $db->sql_build_query('SELECT', $sql_ary);
$result = $db->sql_query($sql);
@@ -917,11 +939,15 @@ if (sizeof($topic_list))
* Modify the topic data before it is assigned to the template
*
* @event core.viewforum_modify_topicrow
- * @var array row Array with topic data
- * @var array topic_row Template array with topic data
+ * @var array row Array with topic data
+ * @var array topic_row Template array with topic data
+ * @var bool s_type_switch Flag indicating if the topic type is [global] announcement
+ * @var bool s_type_switch_test Flag indicating if the test topic type is [global] announcement
* @since 3.1.0-a1
+ *
+ * @changed 3.1.10-RC1 Added s_type_switch, s_type_switch_test
*/
- $vars = array('row', 'topic_row');
+ $vars = array('row', 'topic_row', 's_type_switch', 's_type_switch_test');
extract($phpbb_dispatcher->trigger_event('core.viewforum_modify_topicrow', compact($vars)));
$template->assign_block_vars('topicrow', $topic_row);