Changeset 595 in subversion

Timestamp:

Jun 5, 2007 12:26:02 PM (6 years ago)

Author:

till

Message:

+ removed patch

• fixed a bug i introduced yesterdayish (send flag)

+ don't allow GET to bin/html2text.php

Location:

branches/devel-vnext

Files:

• bin/html2text.php (modified) (2 diffs)
• index.php (modified) (2 diffs)
• program/include/rcube_imap.inc (modified) (1 diff)
• program/steps/mail/sendmail.inc (modified) (1 diff)

branches/devel-vnext/bin/html2text.php

@@ -1 +1 @@
 <?php
+if ($_SERVER['REQUEST_METHOD'] == 'GET') {
+    echo 'Method not allowed.';
+    exit;
+}
+require_once dirname(__FILE__) . '/../program/lib/html2text.inc';
 
-require_once('../program/lib/html2text.inc');
-
-$htmlText = $HTTP_RAW_POST_DATA;
+$htmlText  = $HTTP_RAW_POST_DATA;
 $converter = new html2text($htmlText);
 
@@ -9 +12 @@
 $plaintext = $converter->get_text();
 
-if (function_exists('html_entity_decode'))
-        print html_entity_decode($plaintext, ENT_COMPAT, 'UTF-8');
-else
-        print $plaintext;
-
+if (function_exists('html_entity_decode')) {
+    echo html_entity_decode($plaintext, ENT_COMPAT, 'UTF-8');
+}
+else {
+    echo $plaintext;
+}
 ?>

branches/devel-vnext/index.php

@@ -113 +113 @@
 require_once 'include/main.inc';
 require_once 'include/cache.inc';
-require_once 'lib/html2text.inc';
 require_once 'PEAR.php';
 
@@ -175 +174 @@
 if ($_action=='error' && !empty($_GET['_code'])) {
     raise_error(array('code' => hexdec($_GET['_code'])), FALSE, TRUE);
-}
-
-// handle HTML->text conversion
-if ($_action=='html2text') {
-    $htmlText  = $HTTP_RAW_POST_DATA;
-        $converter = new html2text($htmlText);
-
-        // TODO possibly replace with rcube_remote_response()
-        header('Content-Type: text/plain');
-        $plaintext = $converter->get_text();
-        echo $plaintext;
-        exit;
 }
 

branches/devel-vnext/program/include/rcube_imap.inc

@@ -1285 +1285 @@
 
 
-  /**
-   * Set message flag to one or several messages
-   *
-   * @param mixed  Message UIDs as array or as comma-separated string
-   * @param string Flag to set: SEEN, UNDELETED, DELETED, RECENT, ANSWERED, DRAFT
-   * @return True on success, False on failure
-   */
-  function set_flag($uids, $flag)
-    {
-    $flag = strtoupper($flag);
-    $msg_ids = array();
-    if (!is_array($uids))
-      $uids = explode(',',$uids);
-
-    foreach ($uids as $uid) {
-      $msg_ids[$uid] = $this->_uid2id($uid);
-    }
-
-    if ($flag=='UNDELETED')
-      $result = iil_C_Undelete($this->conn, $this->mailbox, join(',', array_values($msg_ids)));
-    else if ($flag=='UNSEEN')
-      $result = iil_C_Unseen($this->conn, $this->mailbox, join(',', array_values($msg_ids)));
-    else
-      $result = iil_C_Flag($this->conn, $this->mailbox, join(',', array_values($msg_ids)), $flag);
-
-    // reload message headers if cached
-    $cache_key = $this->mailbox.'.msg';
-    if ($this->caching_enabled)
-      {
-      foreach ($msg_ids as $uid => $id)
-        {
-        if ($cached_headers = $this->get_cached_message($cache_key, $uid))
-          {
-          $this->remove_message_cache($cache_key, $id);
-          //$this->get_headers($uid);
-          }
-        }
-
-      // close and re-open connection
-      // this prevents connection problems with Courier
-      $this->reconnect();
-      }
-
-    // set nr of messages that were flaged
-    $count = count($msg_ids);
-
-    // clear message count cache
-    if ($result && $flag=='SEEN')
-      $this->_set_messagecount($this->mailbox, 'UNSEEN', $count*(-1));
-    else if ($result && $flag=='UNSEEN')
-      $this->_set_messagecount($this->mailbox, 'UNSEEN', $count);
-    else if ($result && $flag=='DELETED')
-      $this->_set_messagecount($this->mailbox, 'ALL', $count*(-1));
-
-    return $result;
-    }
-
-
-  // append a mail message (source) to a specific mailbox
-  function save_message($mbox_name, &$message)
-    {
-    $mbox_name = stripslashes($mbox_name);
-    $mailbox = $this->_mod_mailbox($mbox_name);
-
-    // make sure mailbox exists
-    if (in_array($mailbox, $this->_list_mailboxes()))
-      $saved = iil_C_Append($this->conn, $mailbox, $message);
-
-    if ($saved)
-      {
-      // increase messagecount of the target mailbox
-      $this->_set_messagecount($mailbox, 'ALL', 1);
-      }
-
-    return $saved;
+    /**
+     * Set message flag to one or several messages
+     *
+     * @param mixed  Message UIDs as array or as comma-separated string
+     * @param string Flag to set: SEEN, UNDELETED, DELETED, RECENT, ANSWERED, DRAFT
+     * @return True on success, False on failure
+     */
+    function set_flag($uids, $flag)
+    {
+        $flag = strtoupper($flag);
+        $msg_ids = array();
+        if (!is_array($uids)) {
+            $uids = explode(',',$uids);
+        }
+        foreach ($uids as $uid) {
+            $msg_ids[$uid] = $this->_uid2id($uid);
+        }
+
+        if ($flag=='UNDELETED') {
+            $result = iil_C_Undelete($this->conn, $this->mailbox, join(',', array_values($msg_ids)));
+        }
+        elseif ($flag=='UNSEEN') {
+            $result = iil_C_Unseen($this->conn, $this->mailbox, join(',', array_values($msg_ids)));
+        }
+        else {
+            $result = iil_C_Flag($this->conn, $this->mailbox, join(',', array_values($msg_ids)), $flag);
+        }
+        //tfk_debug($result);
+        // reload message headers if cached
+        $cache_key = $this->mailbox.'.msg';
+        if ($this->caching_enabled) {
+            foreach ($msg_ids as $uid => $id) {
+                if ($cached_headers = $this->get_cached_message($cache_key, $uid)) {
+                    $this->remove_message_cache($cache_key, $id);
+                    //$this->get_headers($uid);
+                }
+            }
+
+            // close and re-open connection
+            // this prevents connection problems with Courier
+            $this->reconnect();
+        }
+
+        // set nr of messages that were flaged
+        $count = count($msg_ids);
+
+        // clear message count cache
+        if ($result && $flag=='SEEN') {
+            $this->_set_messagecount($this->mailbox, 'UNSEEN', $count*(-1));
+        }
+        elseif ($result && $flag=='UNSEEN') {
+            $this->_set_messagecount($this->mailbox, 'UNSEEN', $count);
+        }
+        elseif ($result && $flag=='DELETED') {
+            $this->_set_messagecount($this->mailbox, 'ALL', $count*(-1));
+        }
+        return $result;
+    }
+
+
+    // append a mail message (source) to a specific mailbox
+    function save_message($mbox_name, &$message)
+    {
+        $mbox_name = stripslashes($mbox_name);
+        $mailbox = $this->_mod_mailbox($mbox_name);
+
+        // make sure mailbox exists
+        if (in_array($mailbox, $this->_list_mailboxes())) {
+            $saved = iil_C_Append($this->conn, $mailbox, $message);
+        }
+        if ($saved) {
+            // increase messagecount of the target mailbox
+            $this->_set_messagecount($mailbox, 'ALL', 1);
+        }
+        return $saved;
     }
 

branches/devel-vnext/program/steps/mail/sendmail.inc

@@ -409 +409 @@
             return;
         }
-
-
-        // set repliead flag
-        if ($_SESSION['compose']['reply_uid']) {
-            $IMAP->set_flag($_SESSION['compose']['reply_uid'], 'ANSWERED');
-        }
     } // End of SMTP Delivery Block
+    // set repliead flag
+    if ($_SESSION['compose']['reply_uid']) {
+        $IMAP->set_flag($_SESSION['compose']['reply_uid'], 'ANSWERED');
+    }
 }
 // Determine which folder to save message