Changeset 1750 for trunk/include/functions_session.inc.php

Timestamp:

Jan 24, 2007, 6:07:08 AM (17 years ago)

Author:

rvelices

Message:

• plugins with own independent scripts work now (cookie_path and url root are

correct)

• prepare a bit some url functions so that later we can fully embed pwg in

scripts located outside pwg

• remove some unnecessary language strings

File:

• trunk/include/functions_session.inc.php (modified) (1 diff)

trunk/include/functions_session.inc.php

@@ -112 +112 @@
   }
   $scr = substr($scr,0,strrpos( $scr,'/'));
+
   // add a trailing '/' if needed
-  return ($scr{strlen($scr)-1} == '/') ? $scr : $scr . '/';
+  $scr .= ($scr{strlen($scr)-1} == '/') ? '' : '/';
+  
+  if ( substr(PHPWG_ROOT_PATH,0,3)=='../')
+  { // this is maybe a plugin inside pwg directory
+    // TODO - what if it is an external script outside PWG ?
+    $scr = $scr.PHPWG_ROOT_PATH;
+    while (1)
+    {
+      $new = preg_replace('#[^/]+/\.\.(/|$)#', '', $scr);
+      if ($new==$scr)
+      {
+        break;
+      }
+      $scr=$new;
+    }
+  }
+  return $scr;
 }