baculum: Reorganize run job code

diff --git a/gui/baculum/protected/API/Class/BaculumAPIServer.php b/gui/baculum/protected/API/Class/BaculumAPIServer.php
index 9d35db4fd9ad4694e90a976ec696915170a5df86..feb15e11fcec24b0672485b5c52d21a84124e412 100644 (file)
--- a/gui/baculum/protected/API/Class/BaculumAPIServer.php
+++ b/gui/baculum/protected/API/Class/BaculumAPIServer.php
@@ -286,7 +286,7 @@ abstract class BaculumAPIServer extends TPage {
         * @return none
         */
        private function post() {
-               $params = null;
+               $params = new stdClass;
                if ($this->Request->contains('create') && is_array($this->Request['create']) && count($this->Request['create']) > 0) {
                        $params = (object)$this->Request['create'];
                }

diff --git a/gui/baculum/protected/API/Pages/API/JobRun.php b/gui/baculum/protected/API/Pages/API/JobRun.php
index 468f9760f4c33c8eb0a85f28ea83f74e1b99cb10..ed4e2305647c551ab9c6b7782c3567fe7adbfb20 100644 (file)
--- a/gui/baculum/protected/API/Pages/API/JobRun.php
+++ b/gui/baculum/protected/API/Pages/API/JobRun.php
@@ -22,27 +22,58 @@
  
 class JobRun extends BaculumAPIServer {
 
-       public function get() {}
-
        public function create($params) {
-               $jobid = property_exists($params, 'id') ? intval($params->id) : 0;
-               $job = $jobid > 0 ? $this->getModule('job')->getJobById($jobid)->name : (property_exists($params, 'name') ? $params->name : null);
-               $level = $params->level;
-               $fileset = property_exists($params, 'fileset') ? $params->fileset : null;
-               $clientid = property_exists($params, 'clientid') ? intval($params->clientid) : null;
-               $client = $this->getModule('client')->getClientById($clientid);
-               $storageid = property_exists($params, 'storageid') ? intval($params->storageid) : null;
-               $storage = $this->getModule('storage')->getStorageById($storageid);
-               $poolid = property_exists($params, 'poolid') ? intval($params->poolid) : null;
-               $pool = $this->getModule('pool')->getPoolById($poolid);
+               $job = null;
+               if (property_exists($params, 'id')) {
+                       $jobid = intval($params->id);
+                       $job_row = $this->getModule('job')->getJobById($jobid);
+                       $job = is_object($job_row) ? $job_row->name : null;
+               } elseif (property_exists($params, 'name') && $this->getModule('misc')->isValidName($params->name)) {
+                       $job = $params->name;
+               }
+               $level = null;
+               if (property_exists($params, 'level')) {
+                       $level = $params->level;
+               }
+               $fileset = null;
+               if (property_exists($params, 'fileset') && $this->getModule('misc')->isValidName($params->fileset)) {
+                       $fileset = $params->fileset;
+               }
+               $client = null;
+               if (property_exists($params, 'clientid')) {
+                       $clientid = intval($params->clientid);
+                       $client_row = $this->getModule('client')->getClientById($clientid);
+                       $client = is_object($client_row) ? $client_row->name : null;
+               } elseif (property_exists($params, 'client') && $this->getModule('misc')->isValidName($params->client)) {
+                       $client = $params->client;
+               }
+               $storage = null;
+               if (property_exists($params, 'storageid')) {
+                       $storageid = intval($params->storageid);
+                       $storage_row = $this->getModule('storage')->getStorageById($storageid);
+                       $storage = is_object($storage_row) ? $storage_row->name : null;
+               } elseif (property_exists($params, 'storage') && $this->getModule('misc')->isValidName($params->storage)) {
+                       $storage = $params->storage;
+               }
+               $pool = null;
+               if (property_exists($params, 'poolid')) {
+                       $poolid = intval($params->poolid);
+                       $pool_row = $this->getModule('pool')->getPoolById($poolid);
+                       $pool = is_object($pool_row) ? $pool_row->name : null;
+               } elseif (property_exists($params, 'pool') && $this->getModule('misc')->isValidName($params->pool)) {
+                       $pool = $params->pool;
+               }
                $priority = property_exists($params, 'priority') ? intval($params->priority) : 10; // default priority is set to 10
+
                $jobid = property_exists($params, 'jobid') ? 'jobid="' . intval($params->jobid) . '"' : '';
-               // @TODO: Move Job name pattern in more appropriate place
-               $verifyjob = property_exists($params, 'verifyjob')  && preg_match('/^[\w\d\.\-\s]+$/', $params->verifyjob) === 1 ? 'verifyjob="' . ($params->verifyjob) . '"' : '';
+               $verifyjob = null;
+               if (property_exists($params, 'verifyjob') && $this->getModule('misc')->isValidName($params->verifyjob)) {
+                       $verifyjob = 'verifyjob="' . $params->verifyjob . '"';
+               }
                
                if(!is_null($job)) {
-                       $isValidLevel = $this->getModule('misc')->isValidJobLevel($params->level);
-                       if($isValidLevel === true) {
+                       $is_valid_level = $this->getModule('misc')->isValidJobLevel($params->level);
+                       if($is_valid_level === true) {
                                if(!is_null($fileset)) {
                                        if(!is_null($client)) {
                                                if(!is_null($storage)) {
@@ -53,9 +84,9 @@ class JobRun extends BaculumAPIServer {
                                                                        'job="' . $job . '"',
                                                                        'level="' . $joblevels[$level] . '"',
                                                                        'fileset="' . $fileset . '"',
-                                                                       'client="' . $client->name . '"',
-                                                                       'storage="' . $storage->name . '"',
-                                                                       'pool="' . $pool->name . '"' ,
+                                                                       'client="' . $client . '"',
+                                                                       'storage="' . $storage . '"',
+                                                                       'pool="' . $pool . '"' ,
                                                                        'priority="' . $priority . '"',
                                                                        $jobid,
                                                                        $verifyjob,

diff --git a/gui/baculum/protected/Common/Class/Miscellaneous.php b/gui/baculum/protected/Common/Class/Miscellaneous.php
index 7051d175c833d3be734bd3909ce6eed0bbbb8946..b143d25d4e73a5dd2dc0451641a8e52cdd228b6f 100644 (file)
--- a/gui/baculum/protected/Common/Class/Miscellaneous.php
+++ b/gui/baculum/protected/Common/Class/Miscellaneous.php
@@ -182,7 +182,7 @@ class Miscellaneous extends TModule {
        }
 
        public function isValidName($name) {
-               return (preg_match('/^[\w:\.\-]{1,127}$/', $name) === 1);
+               return (preg_match('/^[\w:\.\-\s]{1,127}$/', $name) === 1);
        }
 
        /**