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.

program/actions/contacts/export.php

@@ -35,8 +35,8 @@ class rcmail_action_contacts_export extends rcmail_action_contacts_index
         $sort_col = $rcmail->config->get('addressbook_sort_col', 'name');
 
         // Use search result
-        if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']])) {
-            $search  = (array) $_SESSION['search'][$_REQUEST['_search']];
+        if (!empty($_REQUEST['_search']) && isset($_SESSION['contact_search'][$_REQUEST['_search']])) {
+            $search  = (array) $_SESSION['contact_search'][$_REQUEST['_search']];
             $records = [];
 
             // Get records from all sources

program/actions/contacts/index.php

@@ -1394,11 +1394,11 @@ class rcmail_action_contacts_index extends rcmail_action
 
         $search_request = $_REQUEST['_search'];
 
-        if (!isset($_SESSION['search'][$search_request])) {
+        if (!isset($_SESSION['contact_search'][$search_request])) {
             return false;
         }
 
-        $search   = (array) $_SESSION['search'][$search_request];
+        $search   = (array) $_SESSION['contact_search'][$search_request];
         $sort_col = $rcmail->config->get('addressbook_sort_col', 'name');
         $afields  = $return ? $rcmail->config->get('contactlist_fields') : ['name', 'email'];
         $records  = [];
@@ -1431,7 +1431,7 @@ class rcmail_action_contacts_index extends rcmail_action
             $search[$s] = $source->get_search_set();
         }
 
-        $_SESSION['search'][$search_request] = $search;
+        $_SESSION['contact_search'][$search_request] = $search;
 
         return $records;
     }

program/actions/contacts/search.php

@@ -168,8 +168,8 @@ class rcmail_action_contacts_search extends rcmail_action_contacts_index
         );
 
         // save search settings in session
-        $_SESSION['search'][$search_request] = $search_set;
-        $_SESSION['search_params'] = ['id' => $search_request, 'data' => [$fields, $search]];
+        $_SESSION['contact_search'][$search_request] = $search_set;
+        $_SESSION['contact_search_params'] = ['id' => $search_request, 'data' => [$fields, $search]];
         $_SESSION['page'] = 1;
 
         if ($adv) {

program/actions/contacts/search_create.php

@@ -36,8 +36,8 @@ class rcmail_action_contacts_search_create extends rcmail_action
         $name   = rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST, true);
 
         if (
-            !empty($_SESSION['search_params'])
-            && ($params = $_SESSION['search_params'])
+            !empty($_SESSION['contact_search_params'])
+            && ($params = $_SESSION['contact_search_params'])
             && $params['id'] == $id
         ) {
             $data = [

program/actions/mail/list_contacts.php

@@ -37,9 +37,9 @@ class rcmail_action_mail_list_contacts extends rcmail_action_mail_index
         $jsresult      = [];
 
         // 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'] : [];
+        if (!empty($_REQUEST['_search']) && isset($_SESSION['contact_search'][$_REQUEST['_search']])) {
+            $search  = (array) $_SESSION['contact_search'][$_REQUEST['_search']];
+            $sparam  = $_SESSION['contact_search_params']['id'] == $_REQUEST['_search'] ? $_SESSION['contact_search_params']['data'] : [];
             $mode    = (int) $rcmail->config->get('addressbook_search_mode');
             $records = [];
 

program/actions/mail/search_contacts.php

@@ -114,8 +114,8 @@ class rcmail_action_mail_search_contacts extends rcmail_action_mail_list_contact
             $search_request = md5('composeaddr' . $search);
 
             // save search settings in session
-            $_SESSION['search'][$search_request] = $search_set;
-            $_SESSION['search_params'] = ['id' => $search_request, 'data' => [$afields, $search]];
+            $_SESSION['contact_search'][$search_request] = $search_set;
+            $_SESSION['contact_search_params'] = ['id' => $search_request, 'data' => [$afields, $search]];
 
             $rcmail->output->show_message('contactsearchsuccessful', 'confirmation', ['nr' => $result->count]);