diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-12-10 17:44:45 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-12-10 17:44:45 +0000 |
| commit | f40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb (patch) | |
| tree | 9b8bf50649470ecd571d06ee5c7f7eeb91a867c7 /phpBB/includes/acp | |
| parent | 7e47135792a2cbf7e25ccdd184b4934b2a9e764d (diff) | |
| download | forums-f40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb.tar forums-f40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb.tar.gz forums-f40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb.tar.bz2 forums-f40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb.tar.xz forums-f40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb.zip | |
- finally correctly calculate current time for birthday calculation [Bug #6030]
- allow searching forums with unsearchable subforums [Bug #6056]
- addition of an optional HTTP_X_FORWARDED_FOR check in sessions, including bans
- do not index forums which have indexing disabled on index recreation [Bug #6060]
- properly handle html entities in the theme editor [Bug #6048]
- anonymous access is no longer required for the LDAP auth plugin [Bug #6046]
- corrected mcp_front queue link to point to approve_details [Bug #6134]
- added direct (dis)approval to mcp_front queue items [Bug #6134]
- proper mysql version test for fulltext-compatibility [Bug #6054]
- added note to style/language "used by" column so it's clear that bots are included
- correctly update bot last visit time [Bug #6108]
git-svn-id: file:///svn/phpbb/trunk@6740 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_search.php | 17 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 6 |
2 files changed, 18 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index f858da6a16..342ec34e29 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -17,7 +17,7 @@ class acp_search var $state; var $search; var $max_post_id; - var $batch_size = 4000; + var $batch_size = 5000; function main($id, $mode) { @@ -320,6 +320,16 @@ class acp_search } else { + $sql = 'SELECT forum_id, enable_indexing + FROM ' . FORUMS_TABLE; + $result = $db->sql_query($sql, 3600); + + while ($row = $db->sql_fetchrow($result)) + { + $forums[$row['forum_id']] = (bool) $row['enable_indexing']; + } + $db->sql_freeresult($result); + $sql = 'SELECT post_id, post_subject, post_text, poster_id, forum_id FROM ' . POSTS_TABLE . ' WHERE post_id >= ' . (int) ($post_counter + 1) . ' @@ -328,7 +338,10 @@ class acp_search while ($row = $db->sql_fetchrow($result)) { - $this->search->index('post', $row['post_id'], $row['post_text'], $row['post_subject'], $row['poster_id'], $row['forum_id']); + if ($forums[$row['forum_id']]) + { + $this->search->index('post', $row['post_id'], $row['post_text'], $row['post_subject'], $row['poster_id'], $row['forum_id']); + } } $db->sql_freeresult($result); diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index a1937b592f..34dbd4c7ff 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -1121,7 +1121,7 @@ pagination_sep = \'{PAGINATION_SEP}\' $s_units = '<option value=""' . (($unit == '') ? ' selected="selected"' : '') . '>' . $user->lang['NO_UNIT'] . '</option>' . $s_units; $template->assign_vars(array( - strtoupper($var) => $value, + strtoupper($var) => htmlspecialchars($value), 'S_' . strtoupper($var) . '_UNITS' => $s_units) ); break; @@ -1162,7 +1162,7 @@ pagination_sep = \'{PAGINATION_SEP}\' default: $template->assign_vars(array( - strtoupper($var) => $value) + strtoupper($var) => htmlspecialchars($value)) ); } } @@ -1226,7 +1226,7 @@ pagination_sep = \'{PAGINATION_SEP}\' break; default: - $value = request_var($var, ''); + $value = htmlspecialchars_decode(request_var($var, '')); } // use the element mapping to create raw css code |