diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-25 12:48:26 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-25 15:06:10 +0200 |
commit | b861e1d69670c023f48c621d1c6bc07016f5400d (patch) | |
tree | 1adba241ec9438c7978392d32e6ca7bf0bf92091 /lib/private/files/mapper.php | |
parent | 6a7be8a36a037dbce813dae93a50301b73054c60 (diff) | |
download | nextcloud-server-b861e1d69670c023f48c621d1c6bc07016f5400d.tar.gz nextcloud-server-b861e1d69670c023f48c621d1c6bc07016f5400d.zip |
Fix code layout before fixing the function
Diffstat (limited to 'lib/private/files/mapper.php')
-rw-r--r-- | lib/private/files/mapper.php | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/lib/private/files/mapper.php b/lib/private/files/mapper.php index 666719da12d..93f6f9bab30 100644 --- a/lib/private/files/mapper.php +++ b/lib/private/files/mapper.php @@ -177,14 +177,12 @@ class Mapper /** * @param integer $index */ - public function slugifyPath($path, $index=null) { + public function slugifyPath($path, $index = null) { $path = $this->stripRootFolder($path, $this->unchangedPhysicalRoot); $pathElements = explode('/', $path); $sluggedElements = array(); - - $last= end($pathElements); - + foreach ($pathElements as $pathElement) { // remove empty elements if (empty($pathElement)) { @@ -196,19 +194,18 @@ class Mapper // apply index to file name if ($index !== null) { - $last= array_pop($sluggedElements); + $last = array_pop($sluggedElements); // if filename contains periods - add index number before last period - if (preg_match('~\.[^\.]+$~i',$last,$extension)){ - array_push($sluggedElements, substr($last,0,-(strlen($extension[0]))).'-'.$index.$extension[0]); + if (preg_match('~\.[^\.]+$~i', $last, $extension)) { + array_push($sluggedElements, substr($last, 0, -(strlen($extension[0]))) . '-' . $index . $extension[0]); } else { // if filename doesn't contain periods add index ofter the last char - array_push($sluggedElements, $last.'-'.$index); - } - + array_push($sluggedElements, $last . '-' . $index); + } } - $sluggedPath = $this->unchangedPhysicalRoot.implode('/', $sluggedElements); + $sluggedPath = $this->unchangedPhysicalRoot . implode('/', $sluggedElements); return $this->stripLast($sluggedPath); } @@ -218,8 +215,7 @@ class Mapper * @param string $text * @return string */ - private function slugify($text) - { + private function slugify($text) { // replace non letter or digits or dots by - $text = preg_replace('~[^\\pL\d\.]+~u', '-', $text); |