Studio-42 /
elFinder
| @@ 1188-1190 (lines=3) @@ | ||
| 1185 | // create unique name for directory |
|
| 1186 | $src = $dir; |
|
| 1187 | $name = basename($path); |
|
| 1188 | if (preg_match('/\.((tar\.(gz|bz|bz2|z|lzo))|cpio\.gz|ps\.gz|xcf\.(gz|bz2)|[a-z0-9]{1,4})$/i', $name, $m)) { |
|
| 1189 | $name = substr($name, 0, strlen($name)-strlen($m[0])); |
|
| 1190 | } |
|
| 1191 | $test = $this->_joinPath(dirname($path), $name); |
|
| 1192 | if ($this->stat($test)) { |
|
| 1193 | $name = $this->uniqueName(dirname($path), $name, '-', false); |
|
| @@ 1035-1037 (lines=3) @@ | ||
| 1032 | // create unique name for directory |
|
| 1033 | $src = $dir; |
|
| 1034 | $name = basename($path); |
|
| 1035 | if (preg_match('/\.((tar\.(gz|bz|bz2|z|lzo))|cpio\.gz|ps\.gz|xcf\.(gz|bz2)|[a-z0-9]{1,4})$/i', $name, $m)) { |
|
| 1036 | $name = substr($name, 0, strlen($name)-strlen($m[0])); |
|
| 1037 | } |
|
| 1038 | $test = dirname($path).DIRECTORY_SEPARATOR.$name; |
|
| 1039 | if (file_exists($test) || is_link($test)) { |
|
| 1040 | $name = $this->uniqueName(dirname($path), $name, '-', false); |
|
