# HG changeset patch
# User Charlie Root
# Date 1737915148 18000
# Node ID db1e51c59ddc31076c2aa4ffae88bbb9ec7b2773
# Parent  d2414df68d7868cb74df454bbabd17f3ef2bf122
various small fixes from upgrades to PHP and/or hangover from fix to apt-get overwrite at beginning of the year somehow

diff -r d2414df68d78 -r db1e51c59ddc plugins/advanced_search/advanced_search.php
--- a/plugins/advanced_search/advanced_search.php	Fri Jan 24 14:20:15 2025 -0500
+++ b/plugins/advanced_search/advanced_search.php	Sun Jan 26 13:12:28 2025 -0500
@@ -604,7 +604,7 @@
 
         if (!empty($search)) {
             $mbox = rcube_utils::get_input_value('folder', rcube_utils::INPUT_GPC);
-            $imap_charset = RCMAIL_CHARSET;
+            $imap_charset = RCUBE_CHARSET;
             $sort_column = rcmail_sort_column();
             $search_str = $this->get_search_query($search);
             $sub_folders = rcube_utils::get_input_value('sub_folders', rcube_utils::INPUT_GPC) == 'true';
@@ -962,7 +962,7 @@
         $folder_count = array();
         foreach ($folders_search as $mbox) {
             $this->rc->storage->set_folder($mbox);
-            $this->rc->storage->search($mbox, $search_string, RCMAIL_CHARSET, $_SESSION['sort_col']);
+            $this->rc->storage->search($mbox, $search_string, RCUBE_CHARSET, $_SESSION['sort_col']);
             $result = array();
             $fcount = $this->rc->storage->count($mbox, 'ALL', !empty($_REQUEST['_refresh']));
             $count += $fcount;
@@ -1005,7 +1005,7 @@
             $multiPage = "true";
         }
         $this->rc->storage->set_folder($mailbox);
-        $this->rc->storage->search($mailbox, $search_string, RCMAIL_CHARSET, $_SESSION['sort_col']);
+        $this->rc->storage->search($mailbox, $search_string, RCUBE_CHARSET, $_SESSION['sort_col']);
         $messages = $this->rc->storage->list_messages('', $startPage);
         if ($multiPage) {
             $messages = array_merge($messages, $this->rc->storage->list_messages('', $startPage+1));
diff -r d2414df68d78 -r db1e51c59ddc plugins/rc_foldersort/rc_foldersort.php
--- a/plugins/rc_foldersort/rc_foldersort.php	Fri Jan 24 14:20:15 2025 -0500
+++ b/plugins/rc_foldersort/rc_foldersort.php	Sun Jan 26 13:12:28 2025 -0500
@@ -172,8 +172,8 @@
     public function preferences_save_hook($args)
     {
         if ($args['section'] == 'mailbox') {
-            $folder_sort_col                  = rcube_utils::get_input_value('_default_sort_col', RCUBE_INPUT_POST);
-            $folder_sort_order                = rcube_utils::get_input_value('_default_sort_order', RCUBE_INPUT_POST);
+            $folder_sort_col                  = rcube_utils::get_input_value('_default_sort_col', rcube_utils::INPUT_POST);
+            $folder_sort_order                = rcube_utils::get_input_value('_default_sort_order', rcube_utils::INPUT_POST);
             $folder_sort                      = $folder_sort_col . '_' . $folder_sort_order;
             $folder_sorts                     = $this->sort_order;
             $folder_sorts['default']          = $folder_sort;
@@ -185,10 +185,10 @@
 
     public function sort_json_action()
     {
-        $cmd    = rcube_utils::get_input_value('cmd', RCUBE_INPUT_POST);
-        $folder = rcube_utils::get_input_value('folder', RCUBE_INPUT_POST);
-        $col    = rcube_utils::get_input_value('col', RCUBE_INPUT_POST);
-        $order  = rcube_utils::get_input_value('order', RCUBE_INPUT_POST);
+        $cmd    = rcube_utils::get_input_value('cmd', rcube_utils::INPUT_POST);
+        $folder = rcube_utils::get_input_value('folder', rcube_utils::INPUT_POST);
+        $col    = rcube_utils::get_input_value('col', rcube_utils::INPUT_POST);
+        $order  = rcube_utils::get_input_value('order', rcube_utils::INPUT_POST);
 
         switch ($cmd) {
             case 'change_session': {