ENH: refs #296 Fixed dashboard

Charles Ma · Charles Ma · commit f9ad0880c38e · 2011-10-18T14:36:19.000+02:00
diff --git a/core/controllers/UploadController.php b/core/controllers/UploadController.php
@@ -262,17 +262,18 @@ public function saveuploadedAction()
 
     if(!empty($pathClient))
       {
-      $tmpArray = split(';;', $pathClient);
+      $tmpArray = explode(';;', $pathClient);
       foreach($tmpArray as $value)
         {
-        if(strpos($value, $filename) !== false)
+        $tmpPathValue = explode('/', $value);
+        if(end($tmpPathValue) == $filename)
           {
           $pathClient = $value;
           break;
           }
         }
       }
-      
+
     $parent = $this->_getParam("parent");
     $license = $this->_getParam("license");
     if(!empty($path) && file_exists($path) && $file_size > 0)
@@ -289,7 +290,7 @@ public function saveuploadedAction()
           {
           $parentDao = $this->Folder->load($parent);
           $this->getLogger()->info($pathClient);
-          $folders = split('/', $pathClient);
+          $folders = explode('/', $pathClient);
           unset($folders[count($folders) - 1]);
           foreach($folders as $folderName)
             {

Original file line number	Diff line number	Diff line change
`@@ -262,17 +262,18 @@ public function saveuploadedAction()`
`262`	`262`
`263`	`263`	`if(!empty($pathClient))`
`264`	`264`	`{`
`265`		`- $tmpArray = split(';;', $pathClient);`
	`265`	`+ $tmpArray = explode(';;', $pathClient);`
`266`	`266`	`foreach($tmpArray as $value)`
`267`	`267`	`{`
`268`		`- if(strpos($value, $filename) !== false)`
	`268`	`+ $tmpPathValue = explode('/', $value);`
	`269`	`+ if(end($tmpPathValue) == $filename)`
`269`	`270`	`{`
`270`	`271`	`$pathClient = $value;`
`271`	`272`	`break;`
`272`	`273`	`}`
`273`	`274`	`}`
`274`	`275`	`}`
`275`		`-`
	`276`	`+`
`276`	`277`	`$parent = $this->_getParam("parent");`
`277`	`278`	`$license = $this->_getParam("license");`
`278`	`279`	`if(!empty($path) && file_exists($path) && $file_size > 0)`
`@@ -289,7 +290,7 @@ public function saveuploadedAction()`
`289`	`290`	`{`
`290`	`291`	`$parentDao = $this->Folder->load($parent);`
`291`	`292`	`$this->getLogger()->info($pathClient);`
`292`		`- $folders = split('/', $pathClient);`
	`293`	`+ $folders = explode('/', $pathClient);`
`293`	`294`	`unset($folders[count($folders) - 1]);`
`294`	`295`	`foreach($folders as $folderName)`
`295`	`296`	`{`