replace deprecated function join with implode

[omvzfs.git] / src / Zvol.php

diff --git a/src/Zvol.php b/src/Zvol.php
index f2d3cd27acb212386d003dad0df9dc196c66d188..e35af5ab0e8c874b424519696b550e98d0b43c6c 100644 (file)
--- a/src/Zvol.php
+++ b/src/Zvol.php
@@ -57,25 +57,25 @@ class OMVModuleZFSZvol {
         * @access public
         */
        public function __construct($name) {
         * @access public
         */
        public function __construct($name) {

+               $zvol_exists = true;

                $this->name = $name;
                $this->name = $name;

-               $qname = preg_quote($name, '/');
-               $cmd = "zfs list -H -t volume 2>&1";
-               $this->exec($cmd, $out, $res);
-               foreach ($out as $line) {
-                       if (preg_match('/^' . $qname . '\t.*$/', $line)) {
-                               $this->updateAllProperties();
-                               $this->size = $this->properties["volsize"]["value"];
-                               continue;
-                       }
+               $cmd = "zfs list -H -t volume " . $name . " 2>&1";
+               try {
+                       $this->exec($cmd, $out, $res);
+                       $this->updateAllProperties();
+                       $this->size = $this->properties["volsize"]["value"];

                }
                }

-               $qname = preg_quote($name . "@", '/');
-               $cmd = "zfs list -H -t snapshot 2>&1";
-               $this->exec($cmd, $out, $res);
-               foreach ($out as $line) {
-                       if (preg_match('/^(' . $qname . '[^\s]+)\t.*$/', $line, $res)) {
-                               $this->snapshots[$res[1]] = new OMVModuleZFSSnapshot($res[1]);
+               catch (OMVModuleZFSException $e) {
+                       $zvol_exists = false;
+               }
+               if ($zvol_exists) {
+                       $cmd = "zfs list -r -d 1 -o name -H -t snapshot " . $name . " 2>&1";
+                       $this->exec($cmd, $out2, $res2);
+                       foreach ($out2 as $line2) {
+                               $this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2);

                        }
                }
                        }
                }

+

        }
 
        /**
        }
 
        /**


@@ -121,6 +121,20 @@ class OMVModuleZFSZvol {
                return $this->size;
        }
 
                return $this->size;
        }
 

+       /**
+        * Get all Snapshots associated with the Zvol
+        * 
+        * @return array $snapshots
+        * @access public
+        */
+       public function getSnapshots() {
+               if (isset($this->snapshots)) {
+                       return $this->snapshots;
+               } else {
+                       return array();
+               }
+       }
+

        /**
         * Sets a number of Zvol properties. If a property is already set it will be updated with the new value.
         * 
        /**
         * Sets a number of Zvol properties. If a property is already set it will be updated with the new value.
         *