Changeset 696 for trunk

Timestamp:

12/11/2011 07:58:43 PM (5 months ago)

Author:

ofer

Message:

Allow CORS (Cross Origin Ajax)

Location:

trunk/WordPress/plugin/transposh

Files:

• core/utils.php (modified) (2 diffs)
• transposh.php (modified) (6 diffs)

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

@@ -396 +396 @@
         //            | ( "1" [ "." 0*3("0") ] )
         preg_match_all("/([[:alpha:]]{1,8})(-([[:alpha:]|-]{1,8}))?" .
-                "(\s*;\s*q\s*=\s*(1\.0{0,3}|0\.\d{0,3}))?\s*(,|$)/i",
-                $http_accept_language, $hits, PREG_SET_ORDER);
+                "(\s*;\s*q\s*=\s*(1\.0{0,3}|0\.\d{0,3}))?\s*(,|$)/i", $http_accept_language, $hits, PREG_SET_ORDER);
 
         // default language (in case of no hits) is the first in the array
@@ -433 +432 @@
     }
 
+    public static function allow_cors() {
+        header('Access-Control-Allow-Origin: *');
+        header('Access-Control-Allow-Methods: GET, POST, OPTIONS');
+        header('Access-Control-Allow-Headers: X-Requested-With');
+        header('Access-Control-Max-Age: 86400');
+    }
+
 }
 

trunk/WordPress/plugin/transposh/transposh.php

@@ -709 +709 @@
     function add_transposh_js() {
         //not in any translation mode - no need for any js.
-        if (!($this->edit_mode || $this->is_auto_translate_permitted() || is_admin())) return; // TODO, check just for settings page admin and pages with our translate
+        if (!($this->edit_mode || $this->is_auto_translate_permitted() || is_admin()))
+                return; // TODO, check just for settings page admin and pages with our translate
 
         wp_enqueue_script('transposh', $this->transposh_plugin_url . '/' . TRANSPOSH_DIR_JS . '/transposh.js', array('jquery'), TRANSPOSH_PLUGIN_VER);
@@ -1200 +1201 @@
         // we need curl for this proxy
         if (!function_exists('curl_init')) return;
+        transposh_utils::allow_cors();
         $tl = $_GET['tl'];
         // we want to avoid unneeded work or dos attacks on languages we don't support
@@ -1247 +1249 @@
         // we need curl for this proxy
         if (!function_exists('curl_init')) return;
+        transposh_utils::allow_cors();
         // target language
         $tl = $_GET['tl'];
@@ -1343 +1346 @@
     function on_ajax_nopriv_tp_history() {
         // deleting
+        transposh_utils::allow_cors();
         if (isset($_GET['timestamp'])) {
             $this->database->del_translation_history($_GET['token'], $_GET['lang'], $_GET['timestamp']);
@@ -1352 +1356 @@
     //  the case of posted translation
     function on_ajax_nopriv_tp_translation() {
+        transposh_utils::allow_cors();
         do_action('transposh_translation_posted');
         $this->database->update_translation();
@@ -1359 +1364 @@
     // getting translation alternates
     function on_ajax_nopriv_tp_trans_alts() {
+        transposh_utils::allow_cors();
         $this->database->get_translation_alt($_GET['token']);
         die();