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.
roundcube · Sep 13, 2021 · c8947ec · c8947ec
1 parent faf99bf
commit c8947ec
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/program/steps/addressbook/export.inc b/program/steps/addressbook/export.inc
@@ -22,9 +22,11 @@
 $RCMAIL->request_security_check(rcube_utils::INPUT_GET);
 
 // Use search result
-if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']])) {
+if (!empty($_REQUEST['_search']) && isset($_SESSION['contact_search'][$_REQUEST['_search']])
+    && is_array($_SESSION['contact_search'][$_REQUEST['_search']])
+) {
     $sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');
-    $search  = (array)$_SESSION['search'][$_REQUEST['_search']];
+    $search  = $_SESSION['contact_search'][$_REQUEST['_search']];
     $records = array();
 
     // Get records from all sources

diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
@@ -985,8 +985,10 @@ function rcmail_search_update($return = false)
 {
     global $RCMAIL;
 
-    if (($search_request = $_REQUEST['_search']) && isset($_SESSION['search'][$search_request])) {
-        $search   = (array)$_SESSION['search'][$search_request];
+    if (($search_request = $_REQUEST['_search']) && isset($_SESSION['contact_search'][$search_request])
+        && is_array($_SESSION['contact_search'][$search_request])
+    ) {
+        $search   = $_SESSION['contact_search'][$search_request];
         $sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');
         $afields  = $return ? $RCMAIL->config->get('contactlist_fields') : array('name', 'email');
         $records  = array();
@@ -1019,7 +1021,7 @@ function rcmail_search_update($return = false)
             $search[$s] = $source->get_search_set();
         }
 
-        $_SESSION['search'][$search_request] = $search;
+        $_SESSION['contact_search'][$search_request] = $search;
 
         return $records;
     }

diff --git a/program/steps/addressbook/search.inc b/program/steps/addressbook/search.inc
@@ -23,8 +23,7 @@ if ($RCMAIL->action == 'search-create') {
     $id   = rcube_utils::get_input_value('_search', rcube_utils::INPUT_POST);
     $name = rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST, true);
 
-    if (($params = $_SESSION['search_params']) && $params['id'] == $id) {
-
+    if (($params = $_SESSION['contact_search_params']) && $params['id'] == $id) {
         $data = array(
             'type' => rcube_user::SEARCH_ADDRESSBOOK,
             'name' => $name,
@@ -211,8 +210,8 @@ function rcmail_contact_search()
         .(is_array($search) ? implode(',', $search) : $search));
 
     // save search settings in session
-    $_SESSION['search'][$search_request] = $search_set;
-    $_SESSION['search_params'] = array('id' => $search_request, 'data' => array($fields, $search));
+    $_SESSION['contact_search'][$search_request] = $search_set;
+    $_SESSION['contact_search_params'] = array('id' => $search_request, 'data' => array($fields, $search));
     $_SESSION['page'] = 1;
 
     if ($adv)

diff --git a/program/steps/mail/list_contacts.inc b/program/steps/mail/list_contacts.inc
@@ -24,9 +24,11 @@ $list_page     = max(1, intval($_GET['_page']));
 $jsresult      = array();
 
 // Use search result
-if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']])) {
-    $search  = (array)$_SESSION['search'][$_REQUEST['_search']];
-    $sparam = $_SESSION['search_params']['id'] == $_REQUEST['_search'] ? $_SESSION['search_params']['data'] : array();
+if (!empty($_REQUEST['_search']) && isset($_SESSION['contact_search'][$_REQUEST['_search']])
+    && is_array($_SESSION['contact_search'][$_REQUEST['_search']])
+) {
+    $search = $_SESSION['contact_search'][$_REQUEST['_search']];
+    $sparam = $_SESSION['contact_search_params']['id'] == $_REQUEST['_search'] ? $_SESSION['contact_search_params']['data'] : array();
 
     // get records from all sources
     foreach ($search as $s => $set) {

diff --git a/program/steps/mail/search_contacts.inc b/program/steps/mail/search_contacts.inc
@@ -97,8 +97,8 @@ if (!empty($result) && $result->count > 0) {
     $search_request = md5('composeaddr' . $search);
 
     // save search settings in session
-    $_SESSION['search'][$search_request] = $search_set;
-    $_SESSION['search_params'] = array('id' => $search_request, 'data' => array($afields, $search));
+    $_SESSION['contact_search'][$search_request] = $search_set;
+    $_SESSION['contact_search_params'] = array('id' => $search_request, 'data' => array($afields, $search));
 
     $OUTPUT->show_message('contactsearchsuccessful', 'confirmation', array('nr' => $result->count));