Changeset 599 for trunk

Timestamp:

01/16/2011 12:41:03 AM (16 months ago)

Author:

ofer

Message:

Fix for #139, by making sure wp_redirect gets rewritten, this probably needs more testing

Location:

trunk/WordPress/plugin/transposh

Files:

• transposh.php (modified) (7 diffs)
• wp/transposh_3rdparty.php (modified) (2 diffs)
• wp/transposh_admin.php (modified) (1 diff)
• wp/transposh_ajax.php (modified) (1 diff)
• wp/transposh_widget.php (modified) (2 diffs)

trunk/WordPress/plugin/transposh/transposh.php

@@ -89 +89 @@
     /** @var might be that page is json... */
     private $attempt_json = false;
+    /** @var boolean Is the wp_redirect being called by transposh? */
+    private $transposh_redirect = false;
 
     /**
@@ -161 +163 @@
 
         // debug function for bad redirects
-        // add_filter('wp_redirect', array(&$this, 'on_wp_redirect'), 10, 2);
+        add_filter('wp_redirect', array(&$this, 'on_wp_redirect'), 10, 2);
         add_filter('redirect_canonical', array(&$this, 'on_redirect_canonical'), 10, 2);
         //
@@ -175 +177 @@
     }
 
-//    function on_wp_redirect($location, $status) {
-//        logger($location);
-//        logger($status);
-//        $trace = debug_backtrace();
-//        logger($trace);
-//        return $location;
-//    }
+    /**
+     * Attempt to fix a wp_redirect being called by someone else to include the language
+     * hoping for no cycles
+     * @param string $location
+     * @param int $status
+     * @return string
+     */
+    function on_wp_redirect($location, $status) {
+        if ($this->transposh_redirect) return $location;
+        logger($status . ' ' . $location);
+        // $trace = debug_backtrace();
+        // logger($trace);
+        // logger($this->target_language);
+        $location = str_replace(array('%2F', '%3A', '%3B', '%3F', '%3D', '%26'), array('/', ':', ';', '?', '=', '&'), urlencode($this->rewrite_url($location)));
+        return $location;
+    }
+
+    /**
+     * Internally used by transposh redirection, to avoid being rewritten by self
+     * assuming we know what we are doing when redirecting
+     * @param string $location
+     * @param int $status
+     */
+    function tp_redirect($location, $status = 302) {
+        $this->transposh_redirect = true;
+        wp_redirect($location, $status);
+    }
 
     /**
@@ -265 +287 @@
                 if (file_exists(ABSPATH . $wp->query_vars['pagename'])) {
                     logger('Redirecting a static file ' . $wp->query_vars['pagename'], 1);
-                    wp_redirect('/' . $wp->query_vars['pagename'], 301);
+                    $this->tp_redirect('/' . $wp->query_vars['pagename'], 301);
                 }
             }
@@ -449 +471 @@
                                 $url = transposh_utils::cleanup_url($_SERVER["REQUEST_URI"], $this->home_url);
                         logger("redirected to $url because of cookie", 4);
-                        wp_redirect($url);
+                        $this->tp_redirect($url);
                         exit;
                     }
@@ -461 +483 @@
                                 $url = transposh_utils::cleanup_url($_SERVER['REQUEST_URI'], $this->home_url);
                         logger("redirected to $url because of bestlang", 4);
-                        wp_redirect($url);
+                        $this->tp_redirect($url);
                         exit;
                     }
@@ -477 +499 @@
             }
             if (transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $this->home_url) && !transposh_utils::get_language_from_url($_SERVER['REQUEST_URI'], $this->home_url)) {
-                wp_redirect(transposh_utils::rewrite_url_lang_param($_SERVER["REQUEST_URI"], $this->home_url, $this->enable_permalinks_rewrite, transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $this->home_url), false)); //."&stop=y");
+                $this->tp_redirect(transposh_utils::rewrite_url_lang_param($_SERVER["REQUEST_URI"], $this->home_url, $this->enable_permalinks_rewrite, transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $this->home_url), false)); //."&stop=y");
                 exit;
             }

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

@@ -38 +38 @@
         add_action('bp_activity_after_save', array(&$this, 'bp_activity_after_save'));
         add_action('transposh_human_translation', array(&$this, 'transposh_buddypress_stream'), 10, 3);
-
+        //bp_activity_permalink_redirect_url (can fit here if generic setting fails)
+        
         // google xml sitemaps - with patch
         add_action('sm_addurl', array(&$this, 'add_sm_transposh_urls'));
@@ -190 +191 @@
 
 }
+
 ?>

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

@@ -267 +267 @@
 
         // lets redirect the post request into get request (you may add additional params at the url, if you need to show save results
-        wp_redirect($_POST['_wp_http_referer']);
+        $this->transposh->tp_redirect($_POST['_wp_http_referer']);
     }
 

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

@@ -68 +68 @@
     setcookie('TR_LNG', transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $my_transposh_plugin->home_url), time() + 90 * 24 * 60 * 60, COOKIEPATH, COOKIE_DOMAIN);
     if ($_SERVER['HTTP_REFERER']) {
-        wp_redirect($_SERVER['HTTP_REFERER']);
+        $this->transposh->tp_redirect($_SERVER['HTTP_REFERER']);
     } else {
-        wp_redirect($my_transposh_plugin->home_url);
+        $this->transposh->tp_redirect($my_transposh_plugin->home_url);
     }
 }

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

@@ -71 +71 @@
             logger("Widget redirect url: $ref", 3);
 
-            wp_redirect($ref);
+            $this->transposh->tp_redirect($ref);
             exit;
         }
@@ -277 +277 @@
         echo '<div id="' . SPAN_PREFIX . 'credit">';
         if (!$this->transposh->options->get_widget_remove_logo()) {
-            echo 'by <a href="http://tran' . 'sposh.org/' . $extralang . '"><img class="' . NO_TRANSLATE_CLASS . '" height="16" width="16" src="' .
+            echo 'by <a href="http://tran' . 'sposh.org/' . $extralang . '"><img height="16" width="16" src="' .
             $plugpath . '/img/tplog' . 'o.png" style="padding:1px;border:0px" title="' . $tagline . '" alt="' . $tagline . '"/></a>';
         }