Changeset 480

Timestamp:

02/18/08 13:54:47 (11 months ago)

Author:

padams

Message:

- added additional url strip rule if dangeling '?' is found at the end of the URL after striping all params.
- refactored link template in wordpress feed tracking

Location:

trunk

Files:

• modules/base/classes/event.php (modified) (1 diff)
• owa_wp.php (modified) (1 diff)

trunk/modules/base/classes/event.php

@@ -319 +319 @@
         function stripDocumentUrl($url) {
                 
-                        if (!empty($this->config['query_string_filters'])):
-                                $filters = str_replace(' ', '', $this->config['query_string_filters']);
-                                $filters = explode(',', $filters);
-                        else:
-                                $filters = array();
-                        endif;
-                        
-                        // OWA specific params to filter
-                        array_push($filters, $this->config['ns'].$this->config['source_param']);
-                        array_push($filters, $this->config['ns'].$this->config['feed_subscription_id']);
-                        
-                        //print_r($filters);
-                        
-                        foreach ($filters as $filter => $value) {
-                                
-                  $url = preg_replace(
-                    '#\?' .
-                    $value .
-                    '=.*$|&' .
-                    $value .
-                    '=.*$|' .
-                    $value .
-                    '=.*&#msiU',
-                    '',
-                    $url
-                  );
-                  
-                }
-                
+                if (!empty($this->config['query_string_filters'])):
+                        $filters = str_replace(' ', '', $this->config['query_string_filters']);
+                        $filters = explode(',', $filters);
+                else:
+                        $filters = array();
+                endif;
+                        
+                // OWA specific params to filter
+                array_push($filters, $this->config['ns'].$this->config['source_param']);
+                array_push($filters, $this->config['ns'].$this->config['feed_subscription_id']);
+                
+                //print_r($filters);
+                
+                foreach ($filters as $filter => $value) {
+                        
+                  $url = preg_replace(
+                        '#\?' .
+                        $value .
+                        '=.*$|&' .
+                        $value .
+                        '=.*$|' .
+                        $value .
+                        '=.*&#msiU',
+                        '',
+                        $url
+                  );
+                  
+                }
+                
+                
+            //check for dangling '?'. this might occure if all params are stripped.
+                
+            // returns last character of string
+                $test = substr($url, -1);               
+                
+                // if dangling '?' is found clean up the url by removing it.
+                if ($test == '?'):
+                        $url = substr($url, 0, -1);
+                endif;  
+                        
         $this->e->debug('striped url: '.$url);
         

trunk/owa_wp.php

@@ -58 +58 @@
                 
                 // check for presence of '?' which is not present under URL rewrite conditions
+        
                 if (strpos($link, "?") === false):
+                        // add the '?' if not found
                         $link .= '?';
                 endif;
                 
-        
-                
                 // setup link template
-                $link_template = "%s&%s&%s";
+                $link_template = "%s&%s=%s&%s=%s";
                         
                 return sprintf($link_template,
                                            $link,
-                                           $this->config['ns'].$this->config['source_param'].'=feed',
-                                           $this->config['ns'].$this->config['feed_subscription_param']."=".$_GET[$this->config['feed_subscription_param']]);
-                                           
-                /*                 
-                if (!empty($_GET[$this->config['feed_subscription_id']])):
-                        return $link."&".$this->config['ns'].$this->config['source_param']."=feed"."&".$this->config['ns'].$this->config['feed_subscription_id']."=".$_GET[$this->config['feed_subscription_id']];
-                else:
-                        return $link."&".$this->config['ns'].$this->config['source_param']."=feed";
-                endif;
-                */
+                                           $this->config['ns'].$this->config['source_param'],
+                                           'feed',
+                                           $this->config['ns'].$this->config['feed_subscription_param'],
+                                           $_GET[$this->config['feed_subscription_param']]);
+                                          
         }