Studio-42 /
elFinder
| @@ 925-927 (lines=3) @@ | ||
| 922 | // create unique name for directory |
|
| 923 | $src = $dir; |
|
| 924 | $name = basename($path); |
|
| 925 | if (preg_match('/\.((tar\.(gz|bz|bz2|z|lzo))|cpio\.gz|ps\.gz|xcf\.(gz|bz2)|[a-z0-9]{1,4})$/i', $name, $m)) { |
|
| 926 | $name = substr($name, 0, strlen($name)-strlen($m[0])); |
|
| 927 | } |
|
| 928 | $test = dirname($path).DIRECTORY_SEPARATOR.$name; |
|
| 929 | if (file_exists($test) || is_link($test)) { |
|
| 930 | $name = $this->uniqueName(dirname($path), $name, '-', false); |
|
| @@ 1183-1185 (lines=3) @@ | ||
| 1180 | // create unique name for directory |
|
| 1181 | $src = $dir; |
|
| 1182 | $name = basename($path); |
|
| 1183 | if (preg_match('/\.((tar\.(gz|bz|bz2|z|lzo))|cpio\.gz|ps\.gz|xcf\.(gz|bz2)|[a-z0-9]{1,4})$/i', $name, $m)) { |
|
| 1184 | $name = substr($name, 0, strlen($name)-strlen($m[0])); |
|
| 1185 | } |
|
| 1186 | $test = $this->_joinPath(dirname($path), $name); |
|
| 1187 | if ($this->stat($test)) { |
|
| 1188 | $name = $this->uniqueName(dirname($path), $name, '-', false); |
|
