mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

- correctly use DISTINCT and GROUP BY in search related SQL [Bug #1256]

Browse Source 
- always display views and replies in search results [Bug #1223]
- display error messages occuring during search index creation/deletion [Bug #1274]
- correctly align the ACP link on the search results page [Bug #1160]
- fixed the search forum box [Bug #1300] and added a search topic box (subBlue: can you please position this a little more visible, didn't want to mess with the CSS ;-))
- correctly check and use show_results on the search page


git-svn-id: file:///svn/phpbb/trunk@5727 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann
2006-03-26 01:36:26 +00:00
parent ed32b4d8dc
commit 8a32e0de74
9 changed files with 81 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
phpBB/includes/acp/acp_search.php
View File

@@ -234,7 +234,12 @@ class acp_search
if (method_exists($this->search, 'delete_index'))
{
// pass a reference to myself so the $search object can make use of save_state() and attributes
$this->search->delete_index($this, $phpbb_admin_path . "index.$phpEx$SID&i=$id&mode=$mode&action=delete");
if ($error = $this->search->delete_index($this, $phpbb_admin_path . "index.$phpEx$SID&i=$id&mode=$mode&action=delete"))
{
$this->state = array('');
$this->save_state();
trigger_error($error . adm_back_link($this->u_action) . $this->close_popup_js());
}
}
else
{
@@ -269,25 +274,23 @@ class acp_search
}
$this->search->tidy();
$this->state = array('');
$this->save_state();
/**
* @todo remove Javascript
*/
trigger_error($user->lang['SEARCH_INDEX_REMOVED'] . adm_back_link($this->u_action) . '<script language="javascript" type="text/javascript">
<!--
close_waitscreen = 1;
//-->
</script>');
trigger_error($user->lang['SEARCH_INDEX_REMOVED'] . adm_back_link($this->u_action) . $this->close_popup_js());
}
else
{
if (method_exists($this->search, 'create_index'))
{
// pass a reference to myself so the $search object can make use of save_state() and attributes
$this->search->create_index($this, $phpbb_admin_path . "index.$phpEx$SID&i=$id&mode=$mode&action=create");
if ($error = $this->search->create_index($this, $phpbb_admin_path . "index.$phpEx$SID&i=$id&mode=$mode&action=create"))
{
$this->state = array('');
$this->save_state();
trigger_error($error . adm_back_link($this->u_action) . $this->close_popup_js());
}
}
else
{
@@ -319,14 +322,7 @@ class acp_search
$this->state = array('');
$this->save_state();
/**
* @todo remove Javascript
*/
trigger_error($user->lang['SEARCH_INDEX_CREATED'] . adm_back_link($this->u_action) . '<script language="javascript" type="text/javascript">
<!--
close_waitscreen = 1;
//-->
</script>');
trigger_error($user->lang['SEARCH_INDEX_CREATED'] . adm_back_link($this->u_action) . $this->close_popup_js());
}
}
@@ -426,6 +422,18 @@ class acp_search
adm_page_footer();
}
function close_popup_js()
{
/**
* @todo remove Javascript
*/
return '<script language="javascript" type="text/javascript">
<!--
close_waitscreen = 1;
//-->
</script>';
}
function get_search_types()
{
global $phpbb_root_path, $phpEx;