Changeset 3127 for branches/2.0/include/functions_url.inc.php

Timestamp:

Feb 5, 2009, 4:04:27 AM (15 years ago)

Author:

rvelices

Message:

merge r 3126 from trunk

• embellish_url compacts now ..
• some trigger improvements (render_category_description)
• improved perf of duplicate_xxx_url ( rewrote func params_for_duplication and remove some vars from $page )

File:

• branches/2.0/include/functions_url.inc.php (modified) (3 diffs)

branches/2.0/include/functions_url.inc.php

@@ -39 +39 @@
     $root_url = PHPWG_ROOT_PATH;
   }
-  if ( dirname($root_url)!='.' )
+  if ( strncmp($root_url, './', 2) != 0 )
   {
     return $root_url;
@@ -171 +171 @@
   global $page;
 
-  if (count($removed) > 0)
-  {
-    $params = array();
-
-    foreach ($page as $page_item_key => $page_item_value)
-    {
-      if (!in_array($page_item_key, $removed))
-      {
-        $params[$page_item_key] = $page_item_value;
-      }
-    }
-  }
-  else
-  {
-    $params = $page;
+  $params = $page;
+
+  foreach ($removed as $param_key)
+  {
+    unset($params[$param_key]);
   }
 
@@ -723 +713 @@
 function embellish_url($url)
 {
-  return str_replace('/./', '/', $url);
+  $url = str_replace('/./', '/', $url);
+  while ( ($dotdot = strpos($url, '/../', 1) ) !== false )
+  {
+    $before = strrpos($url, '/', -(strlen($url)-$dotdot+1) );
+    if ($before !== false)
+    {
+      $url = substr_replace($url, '', $before, $dotdot-$before+3);
+    }
+    else
+      break;
+  }
+  return $url;
 }