Changeset 142

Timestamp:

03/30/2009 10:07:47 PM (3 years ago)

Author:

ofer

Message:

Prevent duplicate insertion to database, second insertion of same text will not change DB

Location:

trunk/WordPress/plugin/transposh

Files:

• core/parser.php (modified) (6 diffs)
• transposh_db.php (modified) (5 diffs)

trunk/WordPress/plugin/transposh/core/parser.php

@@ -566 +566 @@
 
                         //Don't break on ` so for our use we don't consider it an entity
-                        //e.g. Jack`s apple. 
-                        //Exception: don't break when we there is a white space after the apostrophe. e.g. `uncategorized` 
-                        if(($entity ==  "’" || $entity == "'" || $entity == "'") 
+                        //e.g. Jack`s apple.
+                        //Exception: don't break when we there is a white space after the apostrophe. e.g. `uncategorized`
+                        if(($entity ==  "’" || $entity == "'" || $entity == "'")
                             && $page[$end_pos + 1] != " ")
                         {
@@ -577 +577 @@
                                 $is_breaker = TRUE;
                         }
-                        
+
 
                         //It is an html entity.
@@ -738 +738 @@
 {
         logger("Enter " . __METHOD__  . " : $start", 4);
-        global $page, $pos;
+        global $page, $pos, $lang;
 
         //trim white space from the start position going forward
@@ -765 +765 @@
         }
 
-        list($translated_text, $source) = fetch_translation($original_text);
+        list($translated_text, $source) = fetch_translation($original_text, $lang);
 
         insert_translation($original_text, $translated_text, $source, $start, $end);
@@ -905 +905 @@
         $use_params = !$enable_permalinks_rewrite;
 
-        //Allow specific override for url rewriting . 
+        //Allow specific override for url rewriting .
         if($enable_permalinks_rewrite &&  function_exists('is_url_excluded_from_permalink_rewrite') &&
            is_url_excluded_from_permalink_rewrite($href))
@@ -911 +911 @@
                 $use_params = TRUE;
         }
-        
+
         $href = rewrite_url_lang_param($href, $lang, $is_edit_mode, $use_params);
 

trunk/WordPress/plugin/transposh/transposh_db.php

@@ -47 +47 @@
  *   Will return NULL if no translation is available.
  */
-function fetch_translation($original)
-{
-        global $wpdb, $lang;
+function fetch_translation($original, $lang)
+{
+        global $wpdb;
         $translated = NULL;
         logger("Enter " . __METHOD__ . ": $original", 4);
@@ -91 +91 @@
                 if($rc === TRUE)
                 {
-                        logger("Stored in cache: $original => $translated", 3);
+                        logger("Stored in cache: $original => {$translated[0]},{$translated[1]}", 3);
                 }
         }
@@ -112 +112 @@
         $source = $_POST['source'];
 
-        logger("Enter " . __FILE__ . " Params: $original , $translation, $lang," . $ref, 3);
+        logger("Enter " . __FILE__ . " Params: $original , $translation, $lang, $ref", 3);
         if(!isset($original) || !isset($translation) || !isset($lang))
         {
@@ -118 +118 @@
                 return;
         }
-        
-        //add  our own custom header - so we will know that we got here 
-        header("Transposh: version_". DB_VERSION);
-        
+
+        $table_name = $wpdb->prefix . TRANSLATIONS_TABLE;
+
+        //Decode & remove already escaped character to avoid double escaping
+        $translation = $wpdb->escape(htmlspecialchars(stripslashes(urldecode($translation))));
+
+        //The original content is encoded as base64 before it is sent (i.e. token), after we
+        //decode it should just the same after it was parsed.
+        $original = $wpdb->escape(html_entity_decode($original, ENT_NOQUOTES, 'UTF-8'));
+
+        //add  our own custom header - so we will know that we got here
+        header("Transposh: ver-<%VERSION%> db_version-". DB_VERSION);
+
+        list($translated_text, $old_source) = fetch_translation($original, $lang);
+        if ($translated_text) {
+                if ($source == 1) {
+                        logger("Warning " . __METHOD__ . " auto-translation for already translated: $original", 0);
+                        return;
+                }
+                if ($translation == $wpdb->escape(htmlspecialchars(stripslashes(urldecode($translated_text)))) && $old_source == $source) {
+                        logger("Warning " . __METHOD__ . " attempt to retranslate with same text: $original, $translation", 0);
+                        return;
+                }
+        }
+
         //Check permissions, first the lanugage must be on the edit list. Then either the user
-        //is a translator or automatic translation if it is enabled. 
-        if(!(is_editable_lang($lang) && 
+        //is a translator or automatic translation if it is enabled.
+        if(!(is_editable_lang($lang) &&
             (is_translator() || ($source == 1 && get_option(ENABLE_AUTO_TRANSLATE)))))
         {
@@ -131 +152 @@
                 exit;
         }
-
-        $table_name = $wpdb->prefix . TRANSLATIONS_TABLE;
-
-        //Decode & remove already escaped character to avoid double escaping
-        $translation = $wpdb->escape(htmlspecialchars(stripslashes(urldecode($translation))));
-
-        //The original content is encoded as base64 before it is sent (i.e. token), after we
-        //decode it should just the same after it was parsed.
-        $original = $wpdb->escape(html_entity_decode($original, ENT_NOQUOTES, 'UTF-8'));
 
         $update = "REPLACE INTO  $table_name (original, translated, lang, source)