Merge branch 'bareos-17.2'

bareos · Feb 14, 2018 · a5da839 · a5da839
2 parents b4ada68 + 3f652ea
commit a5da839
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,11 +10,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 
 ### Changed
-- Fix to bugreport #887
-- Selenium tests enhanced
 
 ### Removed
 
+## [17.2.5]
+
+### Changed
+- Fix to bugreport #887
+- Fix to bugreport #893
+- Fix to bugreport #905
+- Selenium tests enhanced
+
 ## [17.2.4]
 
 ### Changed

diff --git a/module/Restore/src/Restore/Controller/RestoreController.php b/module/Restore/src/Restore/Controller/RestoreController.php
@@ -346,7 +346,7 @@ private function buildSubtree()
                --$dnum;
                $items .= '{';
                $items .= '"id":"-' . $dir['pathid'] . '"';
-               $items .= ',"text":"' . preg_replace('/[\x00-\x1F\x7F]/', '', $dir["name"]) . '"';
+               $items .= ',"text":"' . preg_replace('/[\x00-\x1F\x7F]/', '', str_replace('"', '\"', $dir["name"])) . '"';
                $items .= ',"icon":"glyphicon glyphicon-folder-close"';
                $items .= ',"state":""';
                $items .= ',"data":' . \Zend\Json\Json::encode($dir, \Zend\Json\Json::TYPE_OBJECT);
@@ -358,18 +358,18 @@ private function buildSubtree()
             }
          }
 
-      }
+         if($fnum > 0) {
+            $items .= ",";
+         }
 
-      if( $tmp > 2 && $fnum > 0 ) {
-         $items .= ",";
       }
 
       if($fnum > 0) {
 
          foreach($this->files as $file) {
             $items .= '{';
             $items .= '"id":"' . $file["fileid"] . '"';
-            $items .= ',"text":"' . preg_replace('/[\x00-\x1F\x7F]/', '', addslashes($file["name"])) . '"';
+            $items .= ',"text":"' . preg_replace('/[\x00-\x1F\x7F]/', '', str_replace('"', '\"', $file["name"])) . '"';
             $items .= ',"icon":"glyphicon glyphicon-file"';
             $items .= ',"state":""';
             $items .= ',"data":' . \Zend\Json\Json::encode($file, \Zend\Json\Json::TYPE_OBJECT);