Refactor getClientBackups method.

Fix permutations and typo introduced in previous refactoring.
bareos · Aug 10, 2016 · 3154f1d · 3154f1d
1 parent d28da49
commit 3154f1d
Showing 1 changed file with 8 additions and 18 deletions.
diff --git a/module/Client/src/Client/Model/ClientModel.php b/module/Client/src/Client/Model/ClientModel.php
@@ -56,27 +56,17 @@ public function getClient(&$bsock=null, $client=null)
    public function getClientBackups(&$bsock=null, $client=null, $fileset=null, $order=null, $limit=null)
    {
       if(isset($bsock, $client)) {
-         if($fileset != null && $order != null && $limit != null) {
-            $cmd = 'list backups client="'.$client.'" fileset="'.$fileset.'" order='.$order.' limit='.$limit.'';
+         $cmd = 'llist backups client="'.$client.'"';
+         if ($fileset != null) {
+            $cmd .= ' fileset="'.$fileset.'"';
          }
-         else if($fileset != null && $order != null && $limit == null) {
-            $cmd = 'list backups client="'.$client.'" fileset="'.$fileset.'" order='.$order;
+         if ($order != null) {
+            $cmd .= ' order='.$order;
          }
-         else if($fileset != null && $order == null && $limit != null) {
-            $cmd = 'llist backups client="'.$client.'" fileset="'.$fileset.'" limit='.$limit;
-         }
-         else if($fileset == null && $order != null && $limit != null) {
-            $cmd = 'llist backups client="'.$client.'" order='.$order.' limit='.$limit;
-         }
-         else if($fileset == null && $order == null && $limit != null) {
-            $cmd = 'llist backups client="'.$client.'" limit='.$limit;
-         }
-         else if($fileset == null && $order != null && $limit == null) {
-            $cmd = 'llist backups client="'.$client.'" order='.$order;
-         }
-         else if($fileset == null && $order == null && $limit == null) {
-            $cmd = 'llist backups client="'.$client.'"';
+         if ($limit != null) {
+            $cmd .= ' limit='.$limit;
          }
+
          $result = $bsock->send_command($cmd, 2, null);
          if(preg_match("/Select/", $result)) {
             return null;