Changeset 611 in subversion

Timestamp:

Jun 8, 2007 7:47:57 PM (6 years ago)

Author:

estadtherr

Message:

fixed html2text in editor

Location:

trunk/roundcubemail

Files:

• bin/html2text.php (modified) (1 diff)
• index.php (modified) (2 diffs)
• program/js/editor.js (modified) (1 diff)

trunk/roundcubemail/bin/html2text.php

@@ -9 +9 @@
 $plaintext = $converter->get_text();
 
-if (function_exists('html_entity_decode'))
+$phpver = explode('.', phpversion());
+$vernum = $phpver[0] . $phpver[1] . $phpver[2];
+
+# html_entity_decode doesn't handle UTF character sets in PHP 4.x
+
+if (($vernum >= 500) && function_exists('html_entity_decode'))
         print html_entity_decode($plaintext, ENT_COMPAT, 'UTF-8');
 else

trunk/roundcubemail/index.php

@@ -83 +83 @@
 require_once('include/main.inc');
 require_once('include/cache.inc');
-require_once('lib/html2text.inc');
 require_once('PEAR.php');
 
@@ -145 +144 @@
 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();
-        print $plaintext;
-
-        exit;
-}
 
 

trunk/roundcubemail/program/js/editor.js

@@ -100 +100 @@
   http_request.onerror = function(o) { rcmail_handle_toggle_error(o); };
   http_request.oncomplete = function(o) { rcmail_set_text_value(o); };
-  var url=rcmail.env.comm_path+'&_action=html2text';
+  var url = rcmail.env.bin_path+'html2text.php';
+  console.log('HTTP request: ' + url);
   http_request.POST(url, htmlText, 'application/octet-stream');
   }