Mercurial > hg > rc1

comparison plugins/advanced_search/advanced_search.php @ 42:db1e51c59ddc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
various small fixes from upgrades to PHP and/or hangover from fix to apt-get overwrite at beginning of the year somehow
author Charlie Root
date Sun, 26 Jan 2025 13:12:28 -0500
parents 50ac5484d514
children
comparison
equal deleted inserted replaced
41:d2414df68d78 42:db1e51c59ddc
602 $page = $page ? $page : 1; 602 $page = $page ? $page : 1;
603 $pagesize = $this->rc->storage->get_pagesize(); 603 $pagesize = $this->rc->storage->get_pagesize();
604 604
605 if (!empty($search)) { 605 if (!empty($search)) {
606 $mbox = rcube_utils::get_input_value('folder', rcube_utils::INPUT_GPC); 606 $mbox = rcube_utils::get_input_value('folder', rcube_utils::INPUT_GPC);
607 $imap_charset = RCMAIL_CHARSET; 607 $imap_charset = RCUBE_CHARSET;
608 $sort_column = rcmail_sort_column(); 608 $sort_column = rcmail_sort_column();
609 $search_str = $this->get_search_query($search); 609 $search_str = $this->get_search_query($search);
610 $sub_folders = rcube_utils::get_input_value('sub_folders', rcube_utils::INPUT_GPC) == 'true'; 610 $sub_folders = rcube_utils::get_input_value('sub_folders', rcube_utils::INPUT_GPC) == 'true';
611 $folders = array(); 611 $folders = array();
612 $result_h = array(); 612 $result_h = array();
960 } 960 }
961 $count = 0; 961 $count = 0;
962 $folder_count = array(); 962 $folder_count = array();
963 foreach ($folders_search as $mbox) { 963 foreach ($folders_search as $mbox) {
964 $this->rc->storage->set_folder($mbox); 964 $this->rc->storage->set_folder($mbox);
965 $this->rc->storage->search($mbox, $search_string, RCMAIL_CHARSET, $_SESSION['sort_col']); 965 $this->rc->storage->search($mbox, $search_string, RCUBE_CHARSET, $_SESSION['sort_col']);
966 $result = array(); 966 $result = array();
967 $fcount = $this->rc->storage->count($mbox, 'ALL', !empty($_REQUEST['_refresh'])); 967 $fcount = $this->rc->storage->count($mbox, 'ALL', !empty($_REQUEST['_refresh']));
968 $count += $fcount; 968 $count += $fcount;
969 $folder_count[$mbox] = $fcount; 969 $folder_count[$mbox] = $fcount;
970 } 970 }
1003 $quantity = $data['to'] - $data['from']; 1003 $quantity = $data['to'] - $data['from'];
1004 if ($data['from'] + $quantity > $pageSize) { 1004 if ($data['from'] + $quantity > $pageSize) {
1005 $multiPage = "true"; 1005 $multiPage = "true";
1006 } 1006 }
1007 $this->rc->storage->set_folder($mailbox); 1007 $this->rc->storage->set_folder($mailbox);
1008 $this->rc->storage->search($mailbox, $search_string, RCMAIL_CHARSET, $_SESSION['sort_col']); 1008 $this->rc->storage->search($mailbox, $search_string, RCUBE_CHARSET, $_SESSION['sort_col']);
1009 $messages = $this->rc->storage->list_messages('', $startPage); 1009 $messages = $this->rc->storage->list_messages('', $startPage);
1010 if ($multiPage) { 1010 if ($multiPage) {
1011 $messages = array_merge($messages, $this->rc->storage->list_messages('', $startPage+1)); 1011 $messages = array_merge($messages, $this->rc->storage->list_messages('', $startPage+1));
1012 } 1012 }
1013 //FIRST: 0 QUANTITY: 2 1013 //FIRST: 0 QUANTITY: 2