X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/a6c3a4dd0c35379fcdec4462739dc92d758a882f..a238c1a16ee1162aa28919ea82d20b83a69c03c1:/src/Utils.php?ds=sidebyside

diff --git a/src/Utils.php b/src/Utils.php
index 3c3f806..c7049dc 100644
--- a/src/Utils.php
+++ b/src/Utils.php
@@ -226,31 +226,11 @@ class OMVModuleZFSUtil {
 						'expanded'=>$expanded,
 						'path'=>$path);
 					$pool = new OMVModuleZFSZpool($path);
+					$tmp['origin'] = "n/a";
 					$tmp['size'] = $pool->getSize();
 					$tmp['used'] = $pool->getAttribute("allocated");
 					$tmp['available'] = $pool->getAttribute("free");
 					$tmp['mountpoint'] = $pool->getMountPoint();
-					$vdevs = $pool->getVdevs();
-					$vdev_type = $vdevs[0]->getType();
-					switch ($vdev_type) {
-					case OMVModuleZFSVdevType::OMVMODULEZFSMIRROR:
-						$pool_type = "Mirror";
-						break;
-					case OMVModuleZFSVdevType::OMVMODULEZFSPLAIN:
-						$pool_type = "Basic";
-						break;
-					case OMVModuleZFSVdevType::OMVMODULEZFSRAIDZ1:
-						$pool_type = "Raidz1";
-						break;
-					case OMVModuleZFSVdevType::OMVMODULEZFSRAIDZ2:
-						$pool_type = "Raidz2";
-						break;
-					case OMVModuleZFSVdevType::OMVMODULEZFSRAIDZ3:
-						$pool_type = "Raidz3";
-						break;
-					}
-					$tmp['pool_type'] = $pool_type;
-					$tmp['nr_disks'] = count($vdevs[0]->getDisks());
 					array_push($objects,$tmp);
 				} else {
 					//This is a Filesystem
@@ -264,20 +244,18 @@ class OMVModuleZFSUtil {
 					$ds =  new OMVModuleZFSDataset($path);
 					if ($ds->isClone()) {
 						//This is a cloned Filesystem
-						$tmp['type'] = "Clone";
 						$tmp['origin'] = $ds->getOrigin();
 					} else {
 						//This is a standard Filesystem.
-						$tmp['type']= ucfirst($type);
+						$tmp['origin'] = "n/a";
 					}
+					$tmp['type']= ucfirst($type);
 					$tmp['size'] = "n/a";
 					$used = $ds->getProperty("used");
 					$tmp['used'] = $used['value'];
 					$available = $ds->getProperty("available");
 					$tmp['available'] = $available['value'];
 					$tmp['mountpoint'] = $ds->getMountPoint();
-					$tmp['pool_type'] = "n/a";
-					$tmp['nr_disks'] = "n/a";
 					array_push($objects,$tmp);
 				}
 				break;
@@ -291,13 +269,19 @@ class OMVModuleZFSUtil {
 					'icon'=>"images/save.png",
 					'path'=>$path,
 					'expanded'=>$expanded);
-				$vol = new OMVModuleZFSZvol();
+				$vol = new OMVModuleZFSZvol($path);
+				if ($vol->isClone()) {
+					//This is a cloned Volume
+					$tmp['origin'] = $vol->getOrigin();
+				} else {
+					//This is a standard Volume
+					$tmp['origin'] = "n/a";
+				}
+				$tmp['type']= ucfirst($type);
 				$tmp['size'] = $vol->getSize();
 				$tmp['used'] = "n/a";
 				$tmp['available'] = "n/a";
 				$tmp['mountpoint'] = "n/a";
-				$tmp['pool_type'] = "n/a";
-				$tmp['nr_disks'] = "n/a";
 				array_push($objects,$tmp);
 				break;
 
@@ -312,12 +296,11 @@ class OMVModuleZFSUtil {
 					'icon'=>'images/zfs_snap.png',
 					'path'=>$path,
 					'expanded'=>$expanded);
+				$tmp['origin'] = "n/a";
 				$tmp['size'] = "n/a";
 				$tmp['used'] = "n/a";
 				$tmp['available'] = "n/a";
 				$tmp['mountpoint'] = "n/a";
-				$tmp['pool_type'] = "n/a";
-				$tmp['nr_disks'] = "n/a";
 				array_push($objects,$tmp);
 				break;