Changeset 72

Timestamp:

03/18/2009 11:46:56 PM (3 years ago)

Author:

ofer

Message:

Fix the problems of special characters (hopefully)

File:

• trunk/WordPress/plugin/transposh/transposh.php (modified) (4 diffs)

trunk/WordPress/plugin/transposh/transposh.php

@@ -227 +227 @@
     global $wpdb, $lang, $table_name;
     $translated = NULL;
-
     logger("Enter " . __METHOD__ . ": $original", 4);
+    $original = $wpdb->escape(html_entity_decode($original, ENT_NOQUOTES, 'UTF-8'));
+    logger("Original is: $original", 3);
     if(ENABLE_APC && function_exists('apc_fetch'))
     {
@@ -305 +306 @@
     global $lang, $home_url;
     $post_url = $home_url . '/index.php';
-    $js .= "\n<script type=\"text/javascript\">var transposh_post_url='$post_url';var transposh_target_lang='$lang';$(document).ready(function() {do_auto_translate();});</script>";
-
+    $js .= "\n<script type=\"text/javascript\">var transposh_post_url='$post_url';var transposh_target_lang='$lang';</script>";
+    if (get_option(ENABLE_AUTO_TRANSLATE,1)) {
+        $js .= "\n<script type=\"text/javascript\">$(document).ready(function() {do_auto_translate();});</script>";
+    }
     echo $js;
 }
@@ -418 +421 @@
 
     //Decode & remove already escaped character to avoid double escaping
-    $original    = $wpdb->escape(stripslashes(urldecode($original)));
+    // TODO: remove logging?
+    logger("orig:" .$original,4);
+    $original    = $wpdb->escape(stripslashes(urldecode(html_entity_decode($original, ENT_NOQUOTES, 'UTF-8'))));
+    logger("orig:" .$original,4);
     $translation = $wpdb->escape(htmlspecialchars(stripslashes(urldecode($translation))));
 
@@ -436 +442 @@
         {
             apc_delete($original .'___'. $lang);
+           // TODO: update cache
+            //$rc = apc_store($original .'___'. $lang, $cache_entry, 3600);
+            //if($rc === TRUE)
+            //{
+//              logger("Stored in cache: $original => $translated", 3);
+            //}
         }
+
         logger("Inserted to db '$original' , '$translation', '$lang' " , 3);
     }