* another router fix, for real this time
parent
4e49582099
commit
2639361804
|
@ -4,6 +4,6 @@
|
||||||
# router(uri, path)
|
# router(uri, path)
|
||||||
function router() {
|
function router() {
|
||||||
route+=("$1")
|
route+=("$1")
|
||||||
route+=("$(sed -E 's/:[A-Za-z0-9]+/[A-Za-z0-9.,%:-_]+/g' <<< "$1")")
|
route+=("$(sed -E 's/:[A-Za-z0-9]+/[A-Za-z0-9.,%:\\-_]+/g' <<< "$1")")
|
||||||
route+=("$2")
|
route+=("$2")
|
||||||
}
|
}
|
||||||
|
|
|
@ -123,8 +123,8 @@ echo "$(date) - IP: ${r[ip]}, PROTO: ${r[proto]}, URL: ${r[url]}, GET_data: ${ge
|
||||||
[[ -f "${cfg[namespace]}/routes.sh" ]] && source "${cfg[namespace]}/routes.sh"
|
[[ -f "${cfg[namespace]}/routes.sh" ]] && source "${cfg[namespace]}/routes.sh"
|
||||||
|
|
||||||
if [[ ${r[status]} != 101 ]]; then
|
if [[ ${r[status]} != 101 ]]; then
|
||||||
|
clean_url="$(sed -E 's/\?.*//' <<< "${r[url]}")"
|
||||||
for (( i=0; i<${#route[@]}; i=i+3 )); do
|
for (( i=0; i<${#route[@]}; i=i+3 )); do
|
||||||
clean_url="$(grep -Poh '.*?\?' <<< "${r[url]}")"
|
|
||||||
if [[ "$(grep -Poh "^${route[$((i+1))]}$" <<< "$clean_url")" != "" ]] || [[ "$(grep -Poh "^${route[$((i+1))]}$" <<< "$clean_url/")" != "" ]]; then
|
if [[ "$(grep -Poh "^${route[$((i+1))]}$" <<< "$clean_url")" != "" ]] || [[ "$(grep -Poh "^${route[$((i+1))]}$" <<< "$clean_url/")" != "" ]]; then
|
||||||
r[status]=212
|
r[status]=212
|
||||||
r[view]="${route[$((i+2))]}"
|
r[view]="${route[$((i+2))]}"
|
||||||
|
|
Loading…
Reference in New Issue