Studio-42 /
elFinder
| @@ 554-566 (lines=13) @@ | ||
| 551 | ||
| 552 | $comps = explode($this->separator, $path); |
|
| 553 | $new_comps = array(); |
|
| 554 | foreach ($comps as $comp) { |
|
| 555 | if (in_array($comp, array('', '.'))) { |
|
| 556 | continue; |
|
| 557 | } |
|
| 558 | ||
| 559 | if (($comp != '..') |
|
| 560 | || (!$initial_slashes && !$new_comps) |
|
| 561 | || ($new_comps && (end($new_comps) == '..'))) { |
|
| 562 | array_push($new_comps, $comp); |
|
| 563 | } elseif ($new_comps) { |
|
| 564 | array_pop($new_comps); |
|
| 565 | } |
|
| 566 | } |
|
| 567 | $comps = $new_comps; |
|
| 568 | $path = implode($this->separator, $comps); |
|
| 569 | if ($initial_slashes) { |
|
| @@ 217-229 (lines=13) @@ | ||
| 214 | ||
| 215 | $comps = explode('/', $path); |
|
| 216 | $new_comps = array(); |
|
| 217 | foreach ($comps as $comp) { |
|
| 218 | if (in_array($comp, array('', '.'))) { |
|
| 219 | continue; |
|
| 220 | } |
|
| 221 | ||
| 222 | if (($comp != '..') |
|
| 223 | || (!$initial_slashes && !$new_comps) |
|
| 224 | || ($new_comps && (end($new_comps) == '..'))) { |
|
| 225 | array_push($new_comps, $comp); |
|
| 226 | } elseif ($new_comps) { |
|
| 227 | array_pop($new_comps); |
|
| 228 | } |
|
| 229 | } |
|
| 230 | $comps = $new_comps; |
|
| 231 | $path = implode('/', $comps); |
|
| 232 | if ($initial_slashes) { |
|
