Mercurial > hg > rc2

changeset 14:abddb304201f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
continue slowly cleaning up after move to 8.3
author Charlie Root
date Sat, 06 Sep 2025 08:16:01 -0400
parents cfac0673464e
children 85a746e95663
files program/lib/Roundcube/rcube_db.php program/lib/Roundcube/rcube_imap_generic.php program/lib/Roundcube/rcube_plugin_api.php program/lib/Roundcube/rcube_result_thread.php
diffstat 4 files changed, 19 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/program/lib/Roundcube/rcube_db.php	Sat Sep 06 08:12:41 2025 -0400
+++ b/program/lib/Roundcube/rcube_db.php	Sat Sep 06 08:16:01 2025 -0400
@@ -26,9 +26,13 @@
 class rcube_db
 {
     public $db_provider;
+    
+    protected $db_pconn;
 
     protected $db_dsnw;               // DSN for write operations
     protected $db_dsnr;               // DSN for read operations
+    protected $db_dsnr_array;
+    protected $db_dsnw_array;
     protected $db_connected = false;  // Already connected ?
     protected $db_mode;               // Connection mode
     protected $dbh;                   // Connection handle
@@ -1140,6 +1144,8 @@
      */
     public static function parse_dsn($dsn)
     {
+      $proto = null;
+
         if (empty($dsn)) {
             return null;
         }
--- a/program/lib/Roundcube/rcube_imap_generic.php	Sat Sep 06 08:12:41 2025 -0400
+++ b/program/lib/Roundcube/rcube_imap_generic.php	Sat Sep 06 08:16:01 2025 -0400
@@ -3908,11 +3908,11 @@
 	    # 420__MB__97ce7451bd364b47894f71ba7eb8ceb1
 	    if ($needStrip) {
 	      set_error_handler(function($e1, $e2) {
-		                 #rcube::write_log('mail',
+		                 rcube::write_log('mail',
 				     "non-num? id: |$id|, prev: |$prev|");
 		                 },
-		E_WARNING);
-	      $incr = substr($id,0,strpos($id,'_')) - substr($prev,0,strpos($prev,'_'));
+		E_ALL);
+	      $incr = intval(substr($id,0,strpos($id,'_'))) - intval(substr($prev,0,strpos($prev,'_')));
 	      restore_error_handler();
 	    }
 	    else {
--- a/program/lib/Roundcube/rcube_plugin_api.php	Sat Sep 06 08:12:41 2025 -0400
+++ b/program/lib/Roundcube/rcube_plugin_api.php	Sat Sep 06 08:16:01 2025 -0400
@@ -164,7 +164,7 @@
         }
 
         // plugin already loaded?
-        if (!$this->plugins[$plugin_name]) {
+        if (!isset($this->plugins[$plugin_name])) {
             $fn = "$plugins_dir/$plugin_name/$plugin_name.php";
 
             if (!is_readable($fn)) {
--- a/program/lib/Roundcube/rcube_result_thread.php	Sat Sep 06 08:12:41 2025 -0400
+++ b/program/lib/Roundcube/rcube_result_thread.php	Sat Sep 06 08:16:01 2025 -0400
@@ -207,8 +207,9 @@
         $this->meta          = array();
         $this->meta['count'] = 0;
 
-        while (($pos = @strpos($this->raw_data, self::SEPARATOR_ELEMENT, $start))
-            || ($start < $datalen && ($pos = $datalen))
+        while ($start < $datalen &&
+	       (($pos = @strpos($this->raw_data, self::SEPARATOR_ELEMENT,
+			       $start)) != false|| ($pos = $datalen))
         ) {
             $len   = $pos - $start;
             $elem  = substr($this->raw_data, $start, $len);
@@ -439,8 +440,9 @@
         // in memory at a time
 
         // Assign roots
-        while (($pos = @strpos($this->raw_data, self::SEPARATOR_ELEMENT, $start))
-            || ($start < $datalen && ($pos = $datalen))
+        while ($start < $datalen &&
+	       (($pos = @strpos($this->raw_data, self::SEPARATOR_ELEMENT,
+				$start)) != false || ($pos = $datalen))
         ) {
             $len   = $pos - $start;
             $elem  = substr($this->raw_data, $start, $len);
@@ -466,8 +468,9 @@
         $result = array_fill_keys($result, null);
         $start = 0;
 
-        while (($pos = @strpos($this->raw_data, self::SEPARATOR_ELEMENT, $start))
-            || ($start < $datalen && ($pos = $datalen))
+        while ($start < $datalen &&
+	       (($pos = @strpos($this->raw_data, self::SEPARATOR_ELEMENT,
+			       $start)) != false || ($pos = $datalen))
         ) {
             $len   = $pos - $start;
             $elem  = substr($this->raw_data, $start, $len);