From: avl <alex.litovchenko@gmail.com>
Date: Sat, 6 Sep 2008 22:10:46 +0000 (+0300)
Subject: Ticket #1 close
X-Git-Tag: 0.5~507
X-Git-Url: https://git.andy128k.dev/?a=commitdiff_plain;h=79bdd4f3b7d46425b352cb91bb1d63ad55076ff7;p=ipf.git

Ticket #1 close
---

diff --git a/ipf/http/url.php b/ipf/http/url.php
index 26d5e8d..d92c442 100644
--- a/ipf/http/url.php
+++ b/ipf/http/url.php
@@ -23,11 +23,12 @@ class IPF_HTTP_URL
 
     public static function getAction()
     {
-        if (isset($_SERVER['ORIG_PATH_INFO'])) {
-            return $_SERVER['ORIG_PATH_INFO'];
-        }
-        if (isset($_SERVER['PATH_INFO'])) {
-            return $_SERVER['PATH_INFO'];
+        if (isset($_SERVER['REQUEST_URI'])) {
+            $uri = $_SERVER['REQUEST_URI'];
+            $pq = strpos($uri,'?');
+            if ($pq!==false)
+                $uri = substr($uri,0,$pq);
+            return $uri;
         }
         return '/';
     }
diff --git a/ipf/middleware/common.php b/ipf/middleware/common.php
index 66098be..dba0824 100644
--- a/ipf/middleware/common.php
+++ b/ipf/middleware/common.php
@@ -6,7 +6,7 @@ class IPF_Middleware_Common
     {
         //print_r($request);
         if (IPF::get('append_slash')){
-            $url = $request->http_host.$request->path_info;
+            $url = $request->http_host.IPF_HTTP_URL::getAction();
             if (substr($url,-1)!='/'){
                 $url = $request->addUrlrotocol($url).'/';
                 return new IPF_HTTP_Response_Redirect($url);