diff plugins/thunderbird_labels/thunderbird_labels.php @ 49:91f005a4f7e9

Slowly cleaning up more php8 Warnings/deprecations
author Charlie Root
date Mon, 06 Oct 2025 12:19:59 -0400
parents 05c4c32948af
children
line wrap: on
line diff
--- a/plugins/thunderbird_labels/thunderbird_labels.php	Mon Oct 06 12:17:00 2025 -0400
+++ b/plugins/thunderbird_labels/thunderbird_labels.php	Mon Oct 06 12:19:59 2025 -0400
@@ -13,7 +13,9 @@
 	public $task = 'mail|settings';
 	private $rc;
 	private $map;
-	
+	private $name;
+	private $add_tb_flags;
+	private $message_tb_labels;
 	function init()
 	{
 		$this->rc = rcmail::get_instance();
@@ -482,9 +484,9 @@
 	// set flags in IMAP server
 	function set_flags()
 	{
-		#rcube::write_log($this->name, "set: ".print_r($_GET, true));
+	  #rcube::write_log($this->name, "set: ".print_r($_GET, true)." rc: ".print_r($this->rc,true));
 
-		$imap = $this->rc->imap;
+		$imap = $this->rc->storage;
 		$cbox = rcube_utils::get_input_value('_cur', rcube_utils::INPUT_GET);
 		$mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GET);
 		$toggle_label = rcube_utils::get_input_value('_toggle_label', rcube_utils::INPUT_GET);
@@ -493,7 +495,8 @@
 		$unflag_uids = rcube_utils::get_input_value('_unflag_uids', rcube_utils::INPUT_GET);
 		$unflag_uids = explode(',', $unflag_uids);
 		
-		$imap->conn->flags = array_merge($imap->conn->flags, $this->add_tb_flags);
+		$imap->conn->flags = array_merge($imap->conn->flags ?? array(),
+						 $this->add_tb_flags);
 		
 		#rcube::write_log($this->name, print_r($flag_uids, true));
 		#rcube::write_log($this->name, print_r($unflag_uids, true));