File tree 5 files changed +19
-14
lines changed
5 files changed +19
-14
lines changed Original file line number Diff line number Diff line change 2222$ RCMAIL ->request_security_check (rcube_utils::INPUT_GET );
2323
2424// Use search result
25- if (!empty ($ _REQUEST ['_search ' ]) && isset ($ _SESSION ['search ' ][$ _REQUEST ['_search ' ]])) {
25+ if (!empty ($ _REQUEST ['_search ' ]) && isset ($ _SESSION ['contact_search ' ][$ _REQUEST ['_search ' ]])
26+ && is_array ($ _SESSION ['contact_search ' ][$ _REQUEST ['_search ' ]])
27+ ) {
2628 $ sort_col = $ RCMAIL ->config ->get ('addressbook_sort_col ' , 'name ' );
27- $ search = ( array ) $ _SESSION ['search ' ][$ _REQUEST ['_search ' ]];
29+ $ search = $ _SESSION ['contact_search ' ][$ _REQUEST ['_search ' ]];
2830 $ records = array ();
2931
3032 // Get records from all sources
Original file line number Diff line number Diff line change @@ -985,8 +985,10 @@ function rcmail_search_update($return = false)
985985{
986986 global $ RCMAIL ;
987987
988- if (($ search_request = $ _REQUEST ['_search ' ]) && isset ($ _SESSION ['search ' ][$ search_request ])) {
989- $ search = (array )$ _SESSION ['search ' ][$ search_request ];
988+ if (($ search_request = $ _REQUEST ['_search ' ]) && isset ($ _SESSION ['contact_search ' ][$ search_request ])
989+ && is_array ($ _SESSION ['contact_search ' ][$ search_request ])
990+ ) {
991+ $ search = $ _SESSION ['contact_search ' ][$ search_request ];
990992 $ sort_col = $ RCMAIL ->config ->get ('addressbook_sort_col ' , 'name ' );
991993 $ afields = $ return ? $ RCMAIL ->config ->get ('contactlist_fields ' ) : array ('name ' , 'email ' );
992994 $ records = array ();
@@ -1019,7 +1021,7 @@ function rcmail_search_update($return = false)
10191021 $ search [$ s ] = $ source ->get_search_set ();
10201022 }
10211023
1022- $ _SESSION ['search ' ][$ search_request ] = $ search ;
1024+ $ _SESSION ['contact_search ' ][$ search_request ] = $ search ;
10231025
10241026 return $ records ;
10251027 }
Original file line number Diff line number Diff line change @@ -23,8 +23,7 @@ if ($RCMAIL->action == 'search-create') {
2323 $ id = rcube_utils::get_input_value ('_search ' , rcube_utils::INPUT_POST );
2424 $ name = rcube_utils::get_input_value ('_name ' , rcube_utils::INPUT_POST , true );
2525
26- if (($ params = $ _SESSION ['search_params ' ]) && $ params ['id ' ] == $ id ) {
27-
26+ if (($ params = $ _SESSION ['contact_search_params ' ]) && $ params ['id ' ] == $ id ) {
2827 $ data = array (
2928 'type ' => rcube_user::SEARCH_ADDRESSBOOK ,
3029 'name ' => $ name ,
@@ -211,8 +210,8 @@ function rcmail_contact_search()
211210 .(is_array ($ search ) ? implode (', ' , $ search ) : $ search ));
212211
213212 // save search settings in session
214- $ _SESSION ['search ' ][$ search_request ] = $ search_set ;
215- $ _SESSION ['search_params ' ] = array ('id ' => $ search_request , 'data ' => array ($ fields , $ search ));
213+ $ _SESSION ['contact_search ' ][$ search_request ] = $ search_set ;
214+ $ _SESSION ['contact_search_params ' ] = array ('id ' => $ search_request , 'data ' => array ($ fields , $ search ));
216215 $ _SESSION ['page ' ] = 1 ;
217216
218217 if ($ adv )
Original file line number Diff line number Diff line change @@ -24,9 +24,11 @@ $list_page = max(1, intval($_GET['_page']));
2424$ jsresult = array ();
2525
2626// Use search result
27- if (!empty ($ _REQUEST ['_search ' ]) && isset ($ _SESSION ['search ' ][$ _REQUEST ['_search ' ]])) {
28- $ search = (array )$ _SESSION ['search ' ][$ _REQUEST ['_search ' ]];
29- $ sparam = $ _SESSION ['search_params ' ]['id ' ] == $ _REQUEST ['_search ' ] ? $ _SESSION ['search_params ' ]['data ' ] : array ();
27+ if (!empty ($ _REQUEST ['_search ' ]) && isset ($ _SESSION ['contact_search ' ][$ _REQUEST ['_search ' ]])
28+ && is_array ($ _SESSION ['contact_search ' ][$ _REQUEST ['_search ' ]])
29+ ) {
30+ $ search = $ _SESSION ['contact_search ' ][$ _REQUEST ['_search ' ]];
31+ $ sparam = $ _SESSION ['contact_search_params ' ]['id ' ] == $ _REQUEST ['_search ' ] ? $ _SESSION ['contact_search_params ' ]['data ' ] : array ();
3032
3133 // get records from all sources
3234 foreach ($ search as $ s => $ set ) {
Original file line number Diff line number Diff line change @@ -97,8 +97,8 @@ if (!empty($result) && $result->count > 0) {
9797 $ search_request = md5 ('composeaddr ' . $ search );
9898
9999 // save search settings in session
100- $ _SESSION ['search ' ][$ search_request ] = $ search_set ;
101- $ _SESSION ['search_params ' ] = array ('id ' => $ search_request , 'data ' => array ($ afields , $ search ));
100+ $ _SESSION ['contact_search ' ][$ search_request ] = $ search_set ;
101+ $ _SESSION ['contact_search_params ' ] = array ('id ' => $ search_request , 'data ' => array ($ afields , $ search ));
102102
103103 $ OUTPUT ->show_message ('contactsearchsuccessful ' , 'confirmation ' , array ('nr ' => $ result ->count ));
104104
You can’t perform that action at this time.
0 commit comments