Move partial parsing to Base library

horde · May 6, 2014 · d359878 · d359878
1 parent 4e3d0ec
commit d359878
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Base.php b/framework/Imap_Client/lib/Horde/Imap/Client/Base.php
@@ -2076,6 +2076,20 @@ public function search($mailbox, $query = null, array $options = array())
             throw new InvalidArgumentException('Cannot specify RELEVANCY results if not doing a FUZZY search.');
         }
 
+        /* Check for partial matching. */
+        if (!empty($options['partial'])) {
+            $pids = $this->getIdsOb($options['partial'], true)->range_string;
+            if (!strlen($pids)) {
+                throw new InvalidArgumentException('Cannot specify empty sequence range for a PARTIAL search.');
+            }
+
+            if (strpos($pids, ':') === false) {
+                $pids .= ':' . $pids;
+            }
+
+            $options['partial'] = $pids;
+        }
+
         /* Optimization - if query is just for a count of either RECENT or
          * ALL messages, we can send status information instead. Can't
          * optimize with unseen queries because we may cause an infinite loop

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
@@ -2118,16 +2118,6 @@ protected function _search($query, $options)
             }
         }
 
-        if (!empty($options['partial'])) {
-            $pids = $this->getIdsOb($options['partial'], true)->range_string;
-            if (!strlen($pids)) {
-                throw new InvalidArgumentException('Cannot specify empty sequence range for a PARTIAL search.');
-            }
-            if (strpos($pids, ':') === false) {
-                $pids .= ':' . $pids;
-            }
-        }
-
         $charset = is_null($options['_query']['charset'])
             ? 'US-ASCII'
             : $options['_query']['charset'];
@@ -2165,7 +2155,7 @@ protected function _search($query, $options)
                     $results = array_diff($results, array('ALL'));
 
                     $results[] = 'PARTIAL';
-                    $results[] = $pids;
+                    $results[] = $options['partial'];
                 }
             }
 
@@ -2216,7 +2206,7 @@ protected function _search($query, $options)
                     $results = array_diff($results, array('ALL'));
 
                     $results[] = 'PARTIAL';
-                    $results[] = $pids;
+                    $results[] = $options['partial'];
                 }
             }