Changeset 365

Timestamp:

01/26/2010 11:13:15 PM (2 years ago)

Author:

ofer

Message:

Remove old database update method which is no longer used

Location:

trunk/WordPress/plugin/transposh/wp

Files:

• transposh_ajax.php (modified) (1 diff)
• transposh_db.php (modified) (1 diff)

trunk/WordPress/plugin/transposh/wp/transposh_ajax.php

@@ -45 +45 @@
 
     if ($_POST['translation_posted'] == 2) {
-        $my_transposh_plugin->database->update_translation_new();
-    }
-    else {
         $my_transposh_plugin->database->update_translation();
     }

trunk/WordPress/plugin/transposh/wp/transposh_db.php

@@ -97 +97 @@
     }
 
-    /*
- * A new translation has been posted, update the translation database.
- * This has changed since we now accept multiple translations at once
-    */
-    function update_translation() {
-
-        $ref=getenv('HTTP_REFERER');
-        $items = $_POST['items'];
-        $lang = $_POST['lang'];
-        $source = $_POST['source'];
-        // check params
-        logger("Enter " . __FILE__ . " Params: $items, $lang, $ref", 53);
-        if(!isset($items) || !isset($lang)) {
-            logger("Enter " . __FILE__ . " missing Params: $items, $lang, $ref", 1);
-            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(!($this->transposh->options->is_editable_language($lang) &&
-                ($this->transposh->is_translator() || ($source == 1 && $this->transposh->options->get_enable_auto_translate())))) {
-            logger("Unauthorized translation attempt " . $_SERVER['REMOTE_ADDR'] , 1);
-            header("HTTP/1.0 401 Unauthorized translation");
-            exit;
-        }
-
-        //add our own custom header - so we will know that we got here
-        header("Transposh: v-".TRANSPOSH_PLUGIN_VER." db_version-". DB_VERSION);
-
-        // transaction log stuff
-        global $user_ID;
-        get_currentuserinfo();
-
-        // log either the user ID or his IP
-        if ('' == $user_ID) {
-            $loguser = $_SERVER['REMOTE_ADDR'];
-        }
-        else {
-            $loguser = $user_ID;
-        }
-        // end tl
-
-        // We are now passing all posted items
-        for ($i=0;$i<$items;$i++) {
-            $original =  base64_url_decode($_POST["tk$i"]);
-            $translation = $_POST["tr$i"];
-            //Decode & remove already escaped character to avoid double escaping
-            $translation = $GLOBALS['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 = $GLOBALS['wpdb']->escape(html_entity_decode($original, ENT_NOQUOTES, 'UTF-8'));
-
-            //Here we check we are not redoing stuff
-            list($translated_text, $old_source) = $this->fetch_translation($original, $lang);
-            if ($translated_text) {
-                if ($source == 1) {
-                    logger("Warning auto-translation for already translated: $original", 0);
-                    return;
-                }
-                if ($translation == $GLOBALS['wpdb']->escape(htmlspecialchars(stripslashes(urldecode($translated_text)))) && $old_source == $source) {
-                    logger("Warning attempt to retranslate with same text: $original, $translation", 0);
-                    return;
-                }
-            }
-            // Setting the values string for the database (notice how concatanation is handled)
-            $values .= "('" . $original . "','" . $translation . "','" . $lang . "','" . $source . "')".(($items != $i+1) ?', ':'');
-            // Setting the transaction log records
-            $logvalues .= "('" . $original . "','" . $translation . "','" . $lang . "','".$loguser."','".$source."')".(($items != $i+1) ?', ':'');
-
-            // If we have caching - we remove previous entry from cache
-            if(ENABLE_APC && function_exists('apc_store')) {
-                apc_delete($original .'___'. $lang);
-            }
-        }
-
-        // perform insertion to the database, with one query :)
-        $update = "REPLACE INTO ".$GLOBALS['wpdb']->prefix . TRANSLATIONS_TABLE." (original, translated, lang, source)
-                VALUES $values";
-        logger($update,4);
-
-        $result = $GLOBALS['wpdb']->query($update);
-
-        if($result !== FALSE) {
-            // update the transaction log too
-            $log = "INSERT INTO ".$GLOBALS['wpdb']->prefix.TRANSLATIONS_LOG." (original, translated, lang, translated_by, source) ".
-                    "VALUES $logvalues";
-            $result = $GLOBALS['wpdb']->query($log);
-
-            logger("Inserted to db '$values'" , 3);
-        }
-        else {
-            logger(mysql_error(),0);
-            logger("Error !!! failed to insert to db $original , $translation, $lang," , 0);
-            header("HTTP/1.0 404 Failed to update language database ".mysql_error());
-        }
-        // this is a termination for the ajax sequence
-        exit;
-    }
-
     /**
      * A new translation has been posted, update the translation database.
      * This has changed since we now accept multiple translations at once
      * This function accepts a new more "versatile" format
+     * TODO - return some info?
      * @global <type> $user_ID - TODO
      */
-    function update_translation_new() {
+    function update_translation() {
 
         $ref=getenv('HTTP_REFERER');