comparison common-functions.inc @ 131:6b882fb6ea46

Do not add '/' at end if we have encoded all params.
author Tom Fredrik Blenning <bfg@bfgconsult.no>
date Sat, 21 Jan 2023 16:43:41 +0100
parents 2370f4450983
children
comparison
equal deleted inserted replaced
130:ee5f98a0bc93 131:6b882fb6ea46
125 $new_params = $urlParams; 125 $new_params = $urlParams;
126 foreach($keys as $param => $val) { 126 foreach($keys as $param => $val) {
127 $new_params[$param] = $val; 127 $new_params[$param] = $val;
128 } 128 }
129 129
130 $numEncParams=0;
130 foreach($nonQueryParams as $nqp) { 131 foreach($nonQueryParams as $nqp) {
131 if (array_key_exists($nqp, $new_params)) { 132 if (array_key_exists($nqp, $new_params)) {
133 ++$numEncParams;
132 $val = $new_params[$nqp]; 134 $val = $new_params[$nqp];
133 if ($val) 135 if ($val)
134 $out .= "/${val}"; 136 $out .= "/${val}";
135 unset($new_params[$nqp]); 137 unset($new_params[$nqp]);
136 } 138 }
139 }
140 if ($numEncParams<count($nonQueryParams)) {
141 $out .= '/';
137 } 142 }
138 143
139 foreach($new_params as $param => $val) { 144 foreach($new_params as $param => $val) {
140 if ($val) { 145 if ($val) {
141 if($first) { 146 if($first) {