Skip to content

E
eepm
Commit 62e4de71 authored by Boris Yumankulov's avatar Boris Yumankulov Committed by Vitaly Lipatov
Browse files
Options

have_end_slash added support to php? url style

for example fixed http://www.svp-team.com/files/svp4-latest.php?linux without this, url is cut to http://www.svp-team.com/files/
parent 1ebc0f96
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
bin/tools_eget
View file @ 62e4de71
...@@ -210,9 +210,9 @@ filter_order() ...@@ -210,9 +210,9 @@ filter_order()
sort -V | tail -n1 sort -V | tail -n1
} }
have_end_slash() have_end_slash_or_php_parametr()
{ {
echo "$1" | grep -q '/$' echo "$1" | grep -qE '(/$|\.php($|\?))'
} }
is_abs_path() is_abs_path()
...@@ -1463,7 +1463,7 @@ make_fileurl() ...@@ -1463,7 +1463,7 @@ make_fileurl()
elif is_abs_path "$fn" ; then elif is_abs_path "$fn" ; then
# if there is file path from the root of the site # if there is file path from the root of the site
url="$(get_host_only "$url")" url="$(get_host_only "$url")"
elif ! have_end_slash "$url" ; then elif ! have_end_slash_or_php_parametr "$url" ; then
url="$(dirname "$url")" url="$(dirname "$url")"
fi fi
...@@ -1550,7 +1550,7 @@ if [ -n "$2" ] ; then ...@@ -1550,7 +1550,7 @@ if [ -n "$2" ] ; then
MASK="$2" MASK="$2"
SEPMASK="$2" SEPMASK="$2"
else else
if have_end_slash "$1" ; then if have_end_slash_or_php_parametr "$1" ; then
URL="$1" URL="$1"
MASK="" MASK=""
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment