aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorn-aleha <nick_aleha@myway.com>2014-04-14 01:14:44 +0300
committern-aleha <nick_aleha@myway.com>2014-04-16 02:14:36 +0300
commit1f44b4da18622c526e89858f7f89df9857f3a00e (patch)
treee9194898772c9058c23c3bf3fbf6fda067446912
parent3ce479f061ce46ad8f1ac3c99a02459ff2b4b2d2 (diff)
downloadforums-1f44b4da18622c526e89858f7f89df9857f3a00e.tar
forums-1f44b4da18622c526e89858f7f89df9857f3a00e.tar.gz
forums-1f44b4da18622c526e89858f7f89df9857f3a00e.tar.bz2
forums-1f44b4da18622c526e89858f7f89df9857f3a00e.tar.xz
forums-1f44b4da18622c526e89858f7f89df9857f3a00e.zip
[ticket/12345] Improve search flood interval message for ascraeus
Show to guests and users the remaining seconds until their next allowed search, if a search flood limit is enabled for them. PHPBB3-12345
-rw-r--r--phpBB/language/en/search.php5
-rw-r--r--phpBB/search.php2
2 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index f65022fbcb..13aa66514c 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -69,7 +69,10 @@ $lang = array_merge($lang, array(
'NO_RECENT_SEARCHES' => 'No searches have been carried out recently.',
'NO_SEARCH' => 'Sorry but you are not permitted to use the search system.',
'NO_SEARCH_RESULTS' => 'No suitable matches were found.',
- 'NO_SEARCH_TIME' => 'Sorry but you cannot use search at this time. Please try again in a few minutes.',
+ 'NO_SEARCH_TIME' => array(
+ 1 => 'Sorry but you cannot use search at this time. Please try again in %d second.',
+ 2 => 'Sorry but you cannot use search at this time. Please try again in %d seconds.',
+ ),
'NO_SEARCH_UNREADS' => 'Sorry but searching for unread posts has been disabled on this board.',
'WORD_IN_NO_POST' => 'No posts were found because the word <strong>%s</strong> is not contained in any post.',
'WORDS_IN_NO_POST' => 'No posts were found because the words <strong>%s</strong> are not contained in any post.',
diff --git a/phpBB/search.php b/phpBB/search.php
index 4756a941f5..749aec45fd 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -108,7 +108,7 @@ if ($interval && !in_array($search_id, array('unreadposts', 'unanswered', 'activ
if ($user->data['user_last_search'] > time() - $interval)
{
$template->assign_var('S_NO_SEARCH', true);
- trigger_error('NO_SEARCH_TIME');
+ trigger_error($user->lang('NO_SEARCH_TIME', (int) ($user->data['user_last_search'] + $interval - time())));
}
}