webui: Remove send_command function argument jobid

bareos · Aug 27, 2019 · a1573c7 · a1573c7
1 parent 420489b
commit a1573c7
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 72 deletions.
diff --git a/webui/module/Client/src/Client/Model/ClientModel.php b/webui/module/Client/src/Client/Model/ClientModel.php
@@ -38,7 +38,7 @@ public function getClients(&$bsock=null)
    {
       if(isset($bsock)) {
          $cmd = 'llist clients current';
-         $result = $bsock->send_command($cmd, 2, null);
+         $result = $bsock->send_command($cmd, 2);
          $clients = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
          return $clients['result']['clients'];
       }
@@ -58,7 +58,7 @@ public function getDotClients(&$bsock=null)
    {
       if(isset($bsock)) {
          $cmd = '.clients';
-         $result = $bsock->send_command($cmd, 2, null);
+         $result = $bsock->send_command($cmd, 2);
          $clients = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
          return $clients['result']['clients'];
       }
@@ -79,7 +79,7 @@ public function getClient(&$bsock=null, $client=null)
    {
       if(isset($bsock, $client)) {
          $cmd = 'llist client="'.$client.'"';
-         $result = $bsock->send_command($cmd, 2, null);
+         $result = $bsock->send_command($cmd, 2);
          $client = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
          return $client['result']['clients'];
       }
@@ -112,7 +112,7 @@ public function getClientBackups(&$bsock=null, $client=null, $fileset=null, $ord
          if ($limit != null) {
             $cmd .= ' limit='.$limit;
          }
-         $result = $bsock->send_command($cmd, 2, null);
+         $result = $bsock->send_command($cmd, 2);
          $backups = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
          return $backups['result']['backups'];
       }
@@ -133,7 +133,7 @@ public function statusClient(&$bsock=null, $name=null)
    {
       if(isset($bsock, $name)) {
          $cmd = 'status client="'.$name;
-         $result = $bsock->send_command($cmd, 0, null);
+         $result = $bsock->send_command($cmd, 0);
          return $result;
       }
       else {
@@ -153,7 +153,7 @@ public function enableClient(&$bsock=null, $name=null)
    {
       if(isset($bsock, $name)) {
          $cmd = 'enable client="'.$name.'" yes';
-         $result = $bsock->send_command($cmd, 0, null);
+         $result = $bsock->send_command($cmd, 0);
          return $result;
       }
       else {
@@ -173,7 +173,7 @@ public function disableClient(&$bsock=null, $name=null)
    {
       if(isset($bsock, $name)) {
          $cmd = 'disable client="'.$name.'" yes';
-         $result = $bsock->send_command($cmd, 0, null);
+         $result = $bsock->send_command($cmd, 0);
          return $result;
       }
       else {

diff --git a/webui/module/Director/src/Director/Model/DirectorModel.php b/webui/module/Director/src/Director/Model/DirectorModel.php
@@ -38,7 +38,7 @@ public function getAvailableCommands(&$bsock=null)
    {
       if(isset($bsock)) {
          $cmd = '.help';
-         $result = $bsock->send_command($cmd, 2, null);
+         $result = $bsock->send_command($cmd, 2);
          $messages = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
          return $messages['result'];
       }
@@ -58,7 +58,7 @@ public function getDirectorVersion(&$bsock=null)
    {
       if(isset($bsock)) {
          $cmd = 'version';
-         $result = $bsock->send_command($cmd, 2, null);
+         $result = $bsock->send_command($cmd, 2);
          $version = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
          return $version['result']['version'];
       }
@@ -78,7 +78,7 @@ public function getDirectorStatus(&$bsock=null)
    {
       if(isset($bsock)) {
          $cmd = 'status director';
-         $result = $bsock->send_command($cmd, 0, null);
+         $result = $bsock->send_command($cmd, 0);
          return $result;
       }
       else {
@@ -111,7 +111,7 @@ public function getDirectorMessages(&$bsock=null, $limit=null, $offset=null, $re
          else if(!$reverse && $offset == null) {
             $cmd = 'list log limit='.$limit;
          }
-         $result = $bsock->send_command($cmd, 2, null);
+         $result = $bsock->send_command($cmd, 2);
          $messages = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
          return $messages['result']['log'];
       }
@@ -131,7 +131,7 @@ public function getDirectorMessages(&$bsock=null, $limit=null, $offset=null, $re
    public function sendDirectorCommand(&$bsock=null, $cmd=null)
    {
       if(isset($bsock, $cmd)) {
-         $result = $bsock->send_command($cmd, 0, null);
+         $result = $bsock->send_command($cmd, 0);
          return $result;
       }
       else {

diff --git a/webui/module/Fileset/src/Fileset/Model/FilesetModel.php b/webui/module/Fileset/src/Fileset/Model/FilesetModel.php
@@ -39,7 +39,7 @@ public function getFilesets(&$bsock=null)
    {
       if(isset($bsock)) {
          $cmd = 'list filesets';
-         $result = $bsock->send_command($cmd, 2, null);
+         $result = $bsock->send_command($cmd, 2);
          $filesets = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
          return $filesets['result']['filesets'];
       }
@@ -60,7 +60,7 @@ public function getFileset(&$bsock=null, $id)
    {
       if(isset($bsock, $id)) {
          $cmd = 'llist fileset filesetid='.$id.'';
-         $result = $bsock->send_command($cmd, 2, null);
+         $result = $bsock->send_command($cmd, 2);
          $fileset = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
          return $fileset['result']['filesets'];
       }
@@ -80,7 +80,7 @@ public function getDotFilesets(&$bsock=null)
    {
       if(isset($bsock)) {
          $cmd = '.filesets';
-         $result = $bsock->send_command($cmd, 2, null);
+         $result = $bsock->send_command($cmd, 2);
          $filesets = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
          return $filesets['result']['filesets'];
       }

diff --git a/webui/module/Job/src/Job/Model/JobModel.php b/webui/module/Job/src/Job/Model/JobModel.php
@@ -56,7 +56,7 @@ public function getJobs(&$bsock=null, $jobname=null, $days=null)
          $offset = 0;
          $retval = array();
          while (true) {
-            $result = $bsock->send_command($cmd . ' limit=' . $limit . ' offset=' . $offset, 2, null);
+            $result = $bsock->send_command($cmd . ' limit=' . $limit . ' offset=' . $offset, 2);
             if (preg_match('/Failed to send result as json. Maybe result message to long?/', $result)) {
                $error = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
                return $error['result']['error'];
@@ -114,7 +114,7 @@ public function getJobsByStatus(&$bsock=null, $jobname=null, $status=null, $days
          $offset = 0;
          $retval = array();
          while (true) {
-            $result = $bsock->send_command($cmd . ' limit=' . $limit . ' offset=' . $offset, 2, null);
+            $result = $bsock->send_command($cmd . ' limit=' . $limit . ' offset=' . $offset, 2);
             if (preg_match('/Failed to send result as json. Maybe result message to long?/', $result)) {
                $error = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
                return $error['result']['error'];
@@ -148,7 +148,7 @@ public function getJob(&$bsock=null, $id=null)
    {
       if(isset($bsock, $id)) {
          $cmd = 'llist jobid='.$id.'';
-         $result = $bsock->send_command($cmd, 2, null);
+         $result = $bsock->send_command($cmd, 2);
          $job = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
          if ( empty($job['result']) ) {
             return false; // No matching records found
@@ -177,7 +177,7 @@ public function getJobLog(&$bsock=null, $id=null)
          $offset = 0;
          $retval = array();
          while (true) {
-            $result = $bsock->send_command($cmd . ' limit=' . $limit . ' offset=' . $offset, 2, null);
+            $result = $bsock->send_command($cmd . ' limit=' . $limit . ' offset=' . $offset, 2);
             if(preg_match('/Failed to send result as json. Maybe result message to long?/', $result)) {
                $error = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
                return $error['result']['error'];
@@ -211,7 +211,7 @@ public function getJobLog(&$bsock=null, $id=null)
    public function getJobMedia(&$bsock=null, $jobid=null)
    {
       $cmd = 'llist jobmedia jobid='.$jobid;
-      $result = $bsock->send_command($cmd, 2, null);
+      $result = $bsock->send_command($cmd, 2);
       if(preg_match('/Failed to send result as json. Maybe result message to long?/', $result)) {
          //return false;
          $error = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
@@ -240,7 +240,7 @@ public function getJobsByType(&$bsock=null, $type=null)
          else {
             $cmd = '.jobs type="'.$type.'"';
          }
-         $result = $bsock->send_command($cmd, 2, null);
+         $result = $bsock->send_command($cmd, 2);
          $jobs = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
          return $jobs['result']['jobs'];
       }
@@ -260,7 +260,7 @@ public function getJobsLastStatus(&$bsock=null)
    {
       if(isset($bsock)) {
          $cmd = 'llist jobs last current enabled';
-         $result = $bsock->send_command($cmd, 2, null);
+         $result = $bsock->send_command($cmd, 2);
          $jobs = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
          return $jobs['result']['jobs'];
       }
@@ -280,7 +280,7 @@ public function getJobTotals(&$bsock=null)
    {
       if(isset($bsock)) {
          $cmd = 'list jobtotals';
-         $result = $bsock->send_command($cmd, 2, null);
+         $result = $bsock->send_command($cmd, 2);
          $jobtotals = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
          return array(0 => $jobtotals['result']['jobtotals']);
       }
@@ -310,7 +310,7 @@ public function getRunningJobsStatistics(&$bsock = null) {
 
             // GET THE JOB STATS
             $cmd = 'list jobstatistics jobid=' . $job['jobid'];
-            $result = $bsock->send_command($cmd, 2, null);
+            $result = $bsock->send_command($cmd, 2);
             $tmp = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
 
             // JOBID, JOBNAME AND CLIENT
@@ -355,7 +355,7 @@ public function getRunningJobsStatistics(&$bsock = null) {
                $level = $jobstats[$i]['level'];
                $cmd = 'list jobs jobname=' . $job['name'] . ' client=' . $job['client'] . ' jobstatus=T joblevel=' . $level . ' last';
 
-               $result = $bsock->send_command($cmd, 2, null);
+               $result = $bsock->send_command($cmd, 2);
                $tmp = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
                $jobstats[$i]['lastbackupsize'] = $tmp['result']['jobs'][0]['jobbytes'];
                if($jobstats[$i]['lastbackupsize'] > 0) {
@@ -402,7 +402,7 @@ public function getRestoreJobs(&$bsock=null)
    {
       if(isset($bsock)) {
          $cmd = '.jobs type=R';
-         $result = $bsock->send_command($cmd, 2, null);
+         $result = $bsock->send_command($cmd, 2);
          $restorejobs = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
          return $restorejobs['result']['jobs'];
       }
@@ -423,7 +423,7 @@ public function runJob(&$bsock=null, $name=null)
    {
       if(isset($bsock, $name)) {
          $cmd = 'run job="'.$name.'" yes';
-         $result = $bsock->send_command($cmd, 0, null);
+         $result = $bsock->send_command($cmd, 0);
          return $result;
       }
       else {
@@ -443,7 +443,7 @@ public function getJobDefaults(&$bsock=null, $name=null)
    {
       if(isset($bsock, $name)) {
          $cmd = '.defaults job="'.$name.'"';
-         $result = $bsock->send_command($cmd, 2, null);
+         $result = $bsock->send_command($cmd, 2);
          $jobdefaults = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
          return $jobdefaults['result']['defaults'];
       }
@@ -497,7 +497,7 @@ public function runCustomJob(&$bsock=null, $jobname=null, $client=null, $fileset
             $cmd .= ' when="' . $when . '"';
          }
          $cmd .= ' yes';
-         $result = $bsock->send_command($cmd, 0 , null);
+         $result = $bsock->send_command($cmd, 0);
          return 'Command send: '. $cmd . ' | Director message: ' . $result;
       }
       else {
@@ -517,7 +517,7 @@ public function rerunJob(&$bsock=null, $id=null)
    {
       if(isset($bsock, $id)) {
          $cmd = 'rerun jobid='.$id.' yes';
-         $result = $bsock->send_command($cmd, 0, null);
+         $result = $bsock->send_command($cmd, 0);
          return $result;
       }
       else {
@@ -537,7 +537,7 @@ public function cancelJob(&$bsock=null, $id=null)
    {
       if(isset($bsock, $id)) {
          $cmd = 'cancel jobid='.$id.' yes';
-         $result = $bsock->send_command($cmd, 0, null);
+         $result = $bsock->send_command($cmd, 0);
          return $result;
       }
       else {
@@ -557,7 +557,7 @@ public function enableJob(&$bsock=null, $name=null)
    {
       if(isset($bsock, $name)) {
          $cmd = 'enable job="'.$name.'" yes';
-         $result = $bsock->send_command($cmd, 0, null);
+         $result = $bsock->send_command($cmd, 0);
          return $result;
       }
       else {
@@ -577,7 +577,7 @@ public function disableJob(&$bsock=null, $name=null)
    {
       if(isset($bsock, $name)) {
          $cmd = 'disable job="'.$name.'" yes';
-         $result = $bsock->send_command($cmd, 0, null);
+         $result = $bsock->send_command($cmd, 0);
          return $result;
       }
       else {

diff --git a/webui/module/Media/src/Media/Model/MediaModel.php b/webui/module/Media/src/Media/Model/MediaModel.php
@@ -43,7 +43,7 @@ public function getVolumes(&$bsock=null)
          $offset = 0;
          $retval = array();
          while (true) {
-            $result = $bsock->send_command($cmd . ' limit=' . $limit . ' offset=' . $offset, 2, null);
+            $result = $bsock->send_command($cmd . ' limit=' . $limit . ' offset=' . $offset, 2);
             if (preg_match('/Failed to send result as json. Maybe result message to long?/', $result)) {
                $error = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
                return $error['result']['error'];
@@ -77,7 +77,7 @@ public function getVolume(&$bsock=null, $volume=null)
    {
       if(isset($bsock, $volume)) {
          $cmd = 'llist volume="'.$volume.'"';
-         $result = $bsock->send_command($cmd, 2, null);
+         $result = $bsock->send_command($cmd, 2);
          $volume = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
          return $volume['result']['volume'];
       }
@@ -98,7 +98,7 @@ public function getVolumeJobs(&$bsock=null, $volume=null)
    {
       if(isset($bsock, $volume)) {
          $cmd = 'llist jobs volume="'.$volume.'"';
-         $result = $bsock->send_command($cmd, 2, null);
+         $result = $bsock->send_command($cmd, 2);
          if(preg_match('/Failed to send result as json. Maybe result message to long?/', $result)) {
             $error = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
             return $error['result']['error'];

diff --git a/webui/module/Pool/src/Pool/Model/PoolModel.php b/webui/module/Pool/src/Pool/Model/PoolModel.php
@@ -39,7 +39,7 @@ public function getPools(&$bsock=null)
    {
       if(isset($bsock)) {
          $cmd = 'llist pools';
-         $result = $bsock->send_command($cmd, 2, null);
+         $result = $bsock->send_command($cmd, 2);
          $pools = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
          return $pools['result']['pools'];
       }
@@ -65,7 +65,7 @@ public function getDotPools(&$bsock=null, $type=null)
          else {
             $cmd = '.pools type="'.$type.'"';
          }
-         $pools = $bsock->send_command($cmd, 2, null);
+         $pools = $bsock->send_command($cmd, 2);
          $result = \Zend\Json\Json::decode($pools, \Zend\Json\Json::TYPE_ARRAY);
          return $result['result']['pools'];
       }
@@ -86,7 +86,7 @@ public function getPool(&$bsock=null, $pool=null)
    {
       if(isset($bsock, $pool)) {
          $cmd = 'llist pool="'.$pool.'"';
-         $result = $bsock->send_command($cmd, 2, null);
+         $result = $bsock->send_command($cmd, 2);
          $pool = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
          return $pool['result']['pools'];
       }
@@ -111,7 +111,7 @@ public function getPoolMedia(&$bsock=null, $pool=null)
          $offset = 0;
          $retval = array();
          while (true) {
-            $result = $bsock->send_command($cmd . ' limit=' . $limit . ' offset=' . $offset, 2, null);
+            $result = $bsock->send_command($cmd . ' limit=' . $limit . ' offset=' . $offset, 2);
             if (preg_match('/Failed to send result as json. Maybe result message to long?/', $result)) {
                $error = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
                return $error['result']['error'];