WebSVN – Moodle – Diff – /admin/tool/messageinbound/roundcube/rcube_imap_generic.php

                 $ccache->open($this->prefs['gssapi_cn']);
                 $gssapicontext = new GSSAPIContext();
                 $gssapicontext->acquireCredentials($ccache);
                 $token   = '';
-                $success = $gssapicontext->initSecContext($this->prefs['gssapi_context'], null, null, null, $token);
+                $success = $gssapicontext->initSecContext($this->prefs['gssapi_context'], '', 0, 0, $token);
                 $token   = base64_encode($token);
+            }
             catch (Exception $e) {
                 trigger_error($e->getMessage(), E_USER_WARNING);
             $_host = ($ssl_mode == 'tls' ? 'tls://' : '') . $host . ':' . $port;
             $this->debug("Connecting to $_host...");
+        }
         if (!empty($this->prefs['socket_options'])) {
-            $options  = array_intersect_key($this->prefs['socket_options'], ['ssl' => 1]);
+            $options = array_intersect_key($this->prefs['socket_options'], ['ssl' => 1, 'socket' => 1]);
-            $context  = stream_context_create($options);
+            $context = stream_context_create($options);
             $this->fp = stream_socket_client($host . ':' . $port, $errno, $errstr,
                 $this->prefs['timeout'], STREAM_CLIENT_CONNECT, $context);
+        }
         else {
                 $result[$id]            = new rcube_message_header;
                 $result[$id]->id        = $id;
                 $result[$id]->subject   = '';
+                $result[$id]->messageID = 'mid:' . $id;
-                $result[$id]->messageID = 'mid:' . $id;
+                $result[$id]->folder = $mailbox;
                 $headers = null;
                                 $result[$id]->flags[$flag] = true;
+                            }
+                        }
+                    }
+                    else if ($name == 'ANNOTATION') {
+                        $result[$id]->annotations = [];
+                        if (!empty($value) && is_array($value)) {
+                            $n = 0;
+                            while (!empty($value[$n]) && is_string($value[$n])) {
+                                $name = $value[$n++];
+                                $list = $value[$n++];
+                                $result[$id]->annotations[$name] = [];
+                                $c = 0;
+                                while (!empty($list[$c]) && is_string($list[$c])) {
+                                    $result[$id]->annotations[$name][$list[$c++]] = $list[$c++];
+                                }
+                            }
+                        }
+                    }
                     else if ($name == 'MODSEQ') {
                         $result[$id]->modseq = $value[0];
+                    }
                     else if ($name == 'ENVELOPE') {
+     *
      * @param string $mailbox     Mailbox name
      * @param mixed  $message_set Message(s) sequence identifier(s) or UID(s)
      * @param bool   $is_uid      True if $message_set contains UIDs
      * @param bool   $bodystr     Enable to add BODYSTRUCTURE data to the result
-     * @param array  $add_headers List of additional headers
+     * @param array  $add_headers List of additional headers to fetch
+     * @param array  $query_items List of additional items to fetch
+     *
      * @return bool|array List of rcube_message_header elements, False on error
      */
-    public function fetchHeaders($mailbox, $message_set, $is_uid = false, $bodystr = false, $add_headers = [])
+    public function fetchHeaders($mailbox, $message_set, $is_uid = false, $bodystr = false, $add_headers = [], $query_items = [])
+    {
-        $query_items = ['UID', 'RFC822.SIZE', 'FLAGS', 'INTERNALDATE'];
+        $query_items = array_unique(array_merge($query_items, ['UID', 'RFC822.SIZE', 'FLAGS', 'INTERNALDATE']));
-        $headers     = ['DATE', 'FROM', 'TO', 'SUBJECT', 'CONTENT-TYPE', 'CC', 'REPLY-TO',
+        $headers = ['DATE', 'FROM', 'TO', 'SUBJECT', 'CONTENT-TYPE', 'CC', 'REPLY-TO',
             'LIST-POST', 'DISPOSITION-NOTIFICATION-TO', 'X-PRIORITY'];
         if (!empty($add_headers)) {
             $add_headers = array_map('strtoupper', $add_headers);
      * @param string $mailbox     Mailbox name
      * @param int    $id          Message sequence identifier or UID
      * @param bool   $is_uid      True if $id is an UID
      * @param bool   $bodystr     Enable to add BODYSTRUCTURE data to the result
      * @param array  $add_headers List of additional headers
+     * @param array  $query_items List of additional items to fetch
+     *
      * @return bool|rcube_message_header Message data, False on error
      */
-    public function fetchHeader($mailbox, $id, $is_uid = false, $bodystr = false, $add_headers = [])
+    public function fetchHeader($mailbox, $id, $is_uid = false, $bodystr = false, $add_headers = [], $query_items = [])
+    {
-        $a = $this->fetchHeaders($mailbox, $id, $is_uid, $bodystr, $add_headers);
+        $a = $this->fetchHeaders($mailbox, $id, $is_uid, $bodystr, $add_headers, $query_items);
         if (is_array($a)) {
             return array_shift($a);
                     $line = trim($this->readLine(1024)); // the OK response line
                     continue;
+                }
                 if ($result !== false) {
-                    $result = $this->decodeContent($result, $mode, true);
+                    $result = $this->decodeContent($result, $mode, true, $prev, $formatted);
+                }
+            }
             // response with string literal
             else if (preg_match('/\{([0-9]+)\}$/', $line, $m)) {
                         $chunk = substr($chunk, 0, $bytes);
                         $len = strlen($chunk);
+                    }
                     $bytes -= $len;
-                    $chunk = $this->decodeContent($chunk, $mode, $bytes <= 0, $prev);
+                    $chunk = $this->decodeContent($chunk, $mode, $bytes <= 0, $prev, $formatted);
                     if ($file) {
                         if (fwrite($file, $chunk) === false) {
+    }
     /**
      * Decodes a chunk of a message part content from a FETCH response.
      *
-     * @param string $chunk   Content
+     * @param string $chunk     Content
-     * @param int    $mode    Encoding mode
+     * @param int    $mode      Encoding mode
-     * @param bool   $is_last Whether it is a last chunk of data
+     * @param bool   $is_last   Whether it is a last chunk of data
+     * @param string $prev      Extra content from the previous chunk
-     * @param string $prev    Extra content from the previous chunk
+     * @param bool   $formatted Format the content for output
+     *
      * @return string Encoded string
      */
-    protected static function decodeContent($chunk, $mode, $is_last = false, &$prev = '')
+    protected static function decodeContent($chunk, $mode, $is_last = false, &$prev = '', $formatted = false)
+    {
         // BASE64
         if ($mode == 1) {
+            }
             else {
                 $prev = '';
+            }
+            // There might be multiple base64 blocks in a single message part,
+            // we have to pass them separately to base64_decode() (#9290)
+            $result = '';
+            foreach (preg_split('|=+|', $chunk, -1, \PREG_SPLIT_NO_EMPTY) as $_chunk) {
-            return base64_decode($chunk);
+                $result .= base64_decode($_chunk);
+            }
             $chunk = $result;
+        }
         // QUOTED-PRINTABLE
-        if ($mode == 2) {
+        elseif ($mode == 2) {
             if (!self::decodeContentChunk($chunk, $prev, $is_last)) {
-                return '';
-            }
+                return '';
             $chunk = preg_replace('/[\t\r\0\x0B]+\n/', "\n", $chunk);
             return quoted_printable_decode($chunk);
-        }
+            $chunk = quoted_printable_decode($chunk);
+        }
         // X-UUENCODE
-        if ($mode == 3) {
+        elseif ($mode == 3) {
             if (!self::decodeContentChunk($chunk, $prev, $is_last)) {
             if (!strlen($chunk)) {
                 return '';
             }
-            return convert_uudecode($chunk);
             $chunk = convert_uudecode($chunk);
+        }
         // Plain text formatted
         // TODO: Formatting should be handled outside of this class
-        if ($mode == 4) {
+        elseif ($mode == 4) {
             if (!self::decodeContentChunk($chunk, $prev, $is_last)) {
                 return '';
+            }
+            if ($is_last) {
+                $chunk = rtrim($chunk, "\t\r\n\0\x0B");
-            if ($is_last) {
+            }
                 $chunk = rtrim($chunk, "\t\r\n\0\x0B");
         if ($formatted) {
             return $result;
+        }
+    }
+    /**
+     * Send the STORE X ANNOTATION command (RFC5257)
+     *
+     * @param string $mailbox Mailbox name
+     * @param array  $entries
+     *
+     * @return bool True on success, False on failure
+     *
+     * @since 1.6.10
+     */
+    public function storeMessageAnnotation($mailbox, $uids, $entries)
+    {
+        if (!$this->hasCapability('ANNOTATE-EXPERIMENT-1')) {
+            return false;
+        }
+        if (empty($entries) || empty($uids)) {
+            $this->setError(self::ERROR_COMMAND, 'Wrong argument for STORE ANNOTATION command');
+            return false;
+        }
+        if (!$this->select($mailbox)) {
+            return false;
+        }
+        /* Example input compatible with rcube_message_header::$annotations:
+           $entries = [
+               '/comment' => [
+                   'value.priv' => 'test1',
+                   'value.shared' => null,
+               ],
+           ];
+        */
+        $request = [];
+        foreach ($entries as $name => $annotation) {
+            if (!empty($annotation)) {
+                foreach ($annotation as $key => $value) {
+                    $annotation[$key] = $this->escape($key) . ' ' . $this->escape($value, true);
+                }
+                $request[] = $this->escape($name);
+                $request[] = $annotation;
+            }
+        }
+        $result = $this->execute(
+            'UID STORE',
+            [$this->compressMessageSet($uids), 'ANNOTATION', $request],
+            self::COMMAND_NORESPONSE
+        );
+        return $result == self::ERROR_OK;
+    }
     /**
      * Returns BODYSTRUCTURE for the specified message.
+     *
      * @param string $mailbox Folder name
      * @param int    $id      Message sequence number or UID

Proyectos de Subversion Moodle

(root)/admin/tool/messageinbound/roundcube/rcube_imap_generic.php – Rev 1 → 1441