Changeset 659 for trunk

Timestamp:

08/07/2011 02:04:22 AM (10 months ago)

Author:

ofer

Message:

Improve behaviour on 404 pages, don't create links to nowhere and don't do the rel alternate on those pages

Location:

trunk/WordPress/plugin/transposh

Files:

• core/utils.php (modified) (7 diffs)
• transposh.php (modified) (2 diffs)
• wp/transposh_widget.php (modified) (1 diff)

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

@@ -59 +59 @@
         //cleanup lang identifier in permalinks
         //remove the language from the url permalink (if in start of path, and is a defined language)
-        $home_path = rtrim(parse_url($home_url, PHP_URL_PATH), "/");
+        $home_path = rtrim(@parse_url($home_url, PHP_URL_PATH), "/");
         logger("home: $home_path " . $parsedurl['path'], 5);
         if ($home_path && strpos($parsedurl['path'], $home_path) === 0) {
@@ -67 +67 @@
         }
 
-        if (strlen($parsedurl['path']) > 2) {
+        if (@strlen($parsedurl['path']) > 2) {
             $secondslashpos = strpos($parsedurl['path'], "/", 1);
             if (!$secondslashpos) $secondslashpos = strlen($parsedurl['path']);
@@ -100 +100 @@
         $newurl = str_replace('&', '&', $url);
         $newurl = html_entity_decode($newurl, ENT_NOQUOTES);
-        $parsedurl = parse_url($newurl);
+        $parsedurl = @parse_url($newurl);
 
         // if we are dealing with some other url, we won't touch it!
-        if (isset($parsedurl['host']) && !($parsedurl['host'] == parse_url($home_url, PHP_URL_HOST))) {
+        if (isset($parsedurl['host']) && !($parsedurl['host'] == @parse_url($home_url, PHP_URL_HOST))) {
             return $url;
         }
@@ -120 +120 @@
         // remove the language from the url permalink (if in start of path, and is a defined language)
         $gluebackhome = false;
-        $home_path = rtrim(parse_url($home_url, PHP_URL_PATH), "/");
+        $home_path = rtrim(@parse_url($home_url, PHP_URL_PATH), "/");
         logger("home: $home_path " . $parsedurl['path'], 5);
         if ($home_path && strpos($parsedurl['path'], $home_path) === 0) {
@@ -191 +191 @@
         // cleanup lang identifier in permalinks
         // remove the language from the url permalink (if in start of path, and is a defined language)
-        $home_path = rtrim(parse_url($home_url, PHP_URL_PATH), "/");
+        $home_path = rtrim(@parse_url($home_url, PHP_URL_PATH), "/");
 //    logger ("home: $home_path ".$parsedurl['path'],5);
         if ($home_path && strpos($parsedurl['path'], $home_path) === 0) {
@@ -335 +335 @@
             else $url2 .= '/' . $part;
         }
-        if ($url2 =='') $url2 = '/';
+        if ($url2 == '') $url2 = '/';
         // TODO: Consider sanitize_title_with_dashes
         // TODO : need to handle params....
@@ -341 +341 @@
         //if (substr($url,strlen($url)-1) == '/') $url2 .= '/';
         //$url2 = rtrim($url2,'/');
-        //logger ("$href $url $url2");
+        // logger("h $home_url hr $href ur $url ur2 $url2");
         //$href = $this->home_url.$url2;
         if (substr($href, strlen($href) - 1) == '/') $url2.='/';
-        return $home_url . $url2.$params;
+        $url2 = str_replace('//', '/', $url2);
+        return $home_url . $url2 . $params;
     }
 

trunk/WordPress/plugin/transposh/transposh.php

@@ -725 +725 @@
      */
     function add_rel_alternate() {
+        if (is_404()) return;
         $widget_args = $this->widget->create_widget_args(true, $this->get_clean_url());
         logger($widget_args, 4);
@@ -862 +863 @@
     function pre_post_search($query) {
         logger('pre post', 4);
-        logger($query->query_vars);
+        logger($query->query_vars, 4);
         // we hide the search query var from further proccesing, because we do this later
         if ($query->query_vars['s']) {

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

@@ -152 +152 @@
         $widget_args = array();
         $page_url = '';
+        if (is_404()) {
+            $clean_page_url = transposh_utils::cleanup_url($this->transposh->home_url,$this->transposh->home_url,true);
+        }
         // loop on the languages
         foreach ($this->transposh->options->get_sorted_langs() as $code => $langrecord) {