mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix code layout before fixing the function

This commit is contained in:
Joas Schilling 2014-08-25 12:48:26 +02:00
parent 6a7be8a36a
commit b861e1d696
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/private/files/mapper.php
View File

@ -177,14 +177,12 @@ class Mapper
/** /**
* @param integer $index * @param integer $index
*/ */
public function slugifyPath($path, $index=null) { public function slugifyPath($path, $index = null) {
$path = $this->stripRootFolder($path, $this->unchangedPhysicalRoot); $path = $this->stripRootFolder($path, $this->unchangedPhysicalRoot);
$pathElements = explode('/', $path); $pathElements = explode('/', $path);
$sluggedElements = array(); $sluggedElements = array();
$last= end($pathElements);
foreach ($pathElements as $pathElement) { foreach ($pathElements as $pathElement) {
// remove empty elements // remove empty elements
if (empty($pathElement)) { if (empty($pathElement)) {
@ -196,19 +194,18 @@ class Mapper
// apply index to file name // apply index to file name
if ($index !== null) { if ($index !== null) {
$last= array_pop($sluggedElements); $last = array_pop($sluggedElements);
// if filename contains periods - add index number before last period // if filename contains periods - add index number before last period
if (preg_match('~\.[^\.]+$~i',$last,$extension)){ if (preg_match('~\.[^\.]+$~i', $last, $extension)) {
array_push($sluggedElements, substr($last,0,-(strlen($extension[0]))).'-'.$index.$extension[0]); array_push($sluggedElements, substr($last, 0, -(strlen($extension[0]))) . '-' . $index . $extension[0]);
} else { } else {
// if filename doesn't contain periods add index ofter the last char // 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); return $this->stripLast($sluggedPath);
} }
@ -218,8 +215,7 @@ class Mapper
* @param string $text * @param string $text
* @return string * @return string
*/ */
private function slugify($text) private function slugify($text) {
{
// replace non letter or digits or dots by - // replace non letter or digits or dots by -
$text = preg_replace('~[^\\pL\d\.]+~u', '-', $text); $text = preg_replace('~[^\\pL\d\.]+~u', '-', $text);