Skip to content

Commit ee809bd

Browse files
committed
Rename session items 'search' and 'search_params' to 'contact_search' and 'contact_search_params'
... to fix potential conflict with the session items for mail search.
1 parent 7d7b1df commit ee809bd

File tree

5 files changed

+19
-14
lines changed

5 files changed

+19
-14
lines changed

Diff for: program/steps/addressbook/export.inc

+4-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@
2424
$RCMAIL->request_security_check(rcube_utils::INPUT_GET);
2525

2626
// Use search result
27-
if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']])) {
27+
if (!empty($_REQUEST['_search']) && isset($_SESSION['contact_search'][$_REQUEST['_search']])
28+
&& is_array($_SESSION['contact_search'][$_REQUEST['_search']])
29+
) {
2830
$sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');
29-
$search = (array)$_SESSION['search'][$_REQUEST['_search']];
31+
$search = $_SESSION['contact_search'][$_REQUEST['_search']];
3032
$records = array();
3133

3234
// Get records from all sources

Diff for: program/steps/addressbook/func.inc

+5-3
Original file line numberDiff line numberDiff line change
@@ -885,8 +885,10 @@ function rcmail_search_update($return = false)
885885
{
886886
global $RCMAIL;
887887

888-
if (($search_request = $_REQUEST['_search']) && isset($_SESSION['search'][$search_request])) {
889-
$search = (array)$_SESSION['search'][$search_request];
888+
if (($search_request = $_REQUEST['_search']) && isset($_SESSION['contact_search'][$search_request])
889+
&& is_array($_SESSION['contact_search'][$search_request])
890+
) {
891+
$search = $_SESSION['contact_search'][$search_request];
890892
$sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');
891893
$afields = $return ? $RCMAIL->config->get('contactlist_fields') : array('name', 'email');
892894
$records = array();
@@ -919,7 +921,7 @@ function rcmail_search_update($return = false)
919921
$search[$s] = $source->get_search_set();
920922
}
921923

922-
$_SESSION['search'][$search_request] = $search;
924+
$_SESSION['contact_search'][$search_request] = $search;
923925

924926
return $records;
925927
}

Diff for: program/steps/addressbook/search.inc

+3-4
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ if ($RCMAIL->action == 'search-create') {
2525
$id = rcube_utils::get_input_value('_search', rcube_utils::INPUT_POST);
2626
$name = rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST, true);
2727

28-
if (($params = $_SESSION['search_params']) && $params['id'] == $id) {
29-
28+
if (($params = $_SESSION['contact_search_params']) && $params['id'] == $id) {
3029
$data = array(
3130
'type' => rcube_user::SEARCH_ADDRESSBOOK,
3231
'name' => $name,
@@ -213,8 +212,8 @@ function rcmail_contact_search()
213212
.(is_array($search) ? implode(',', $search) : $search));
214213

215214
// save search settings in session
216-
$_SESSION['search'][$search_request] = $search_set;
217-
$_SESSION['search_params'] = array('id' => $search_request, 'data' => array($fields, $search));
215+
$_SESSION['contact_search'][$search_request] = $search_set;
216+
$_SESSION['contact_search_params'] = array('id' => $search_request, 'data' => array($fields, $search));
218217
$_SESSION['page'] = 1;
219218

220219
if ($adv)

Diff for: program/steps/mail/list_contacts.inc

+5-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ $list_page = max(1, intval($_GET['_page']));
2626
$jsresult = array();
2727

2828
// Use search result
29-
if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']])) {
30-
$search = (array)$_SESSION['search'][$_REQUEST['_search']];
31-
$sparam = $_SESSION['search_params']['id'] == $_REQUEST['_search'] ? $_SESSION['search_params']['data'] : array();
29+
if (!empty($_REQUEST['_search']) && isset($_SESSION['contact_search'][$_REQUEST['_search']])
30+
&& is_array($_SESSION['contact_search'][$_REQUEST['_search']])
31+
) {
32+
$search = $_SESSION['contact_search'][$_REQUEST['_search']];
33+
$sparam = $_SESSION['contact_search_params']['id'] == $_REQUEST['_search'] ? $_SESSION['contact_search_params']['data'] : array();
3234

3335
// get records from all sources
3436
foreach ($search as $s => $set) {

Diff for: program/steps/mail/search_contacts.inc

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ if (!empty($result) && $result->count > 0) {
9999
$search_request = md5('composeaddr' . $search);
100100

101101
// save search settings in session
102-
$_SESSION['search'][$search_request] = $search_set;
103-
$_SESSION['search_params'] = array('id' => $search_request, 'data' => array($afields, $search));
102+
$_SESSION['contact_search'][$search_request] = $search_set;
103+
$_SESSION['contact_search_params'] = array('id' => $search_request, 'data' => array($afields, $search));
104104

105105
$OUTPUT->show_message('contactsearchsuccessful', 'confirmation', array('nr' => $result->count));
106106

0 commit comments

Comments
 (0)