From 46e161ec3ab6b10f512cb5cbfcb029fe18bafe1b Mon Sep 17 00:00:00 2001 From: Malishev Dmitry Date: Thu, 29 Dec 2011 19:59:51 +0300 Subject: [PATCH] Batch operations backend. Closes #8 --- web/vesta/api/CRON.class.php | 12 +++++++++--- web/vesta/api/DB.class.php | 12 +++++++++--- web/vesta/api/DNS.class.php | 12 +++++++++--- web/vesta/api/USER.class.php | 9 +++++++++ web/vesta/api/WEB_DOMAIN.class.php | 12 +++++++++--- 5 files changed, 45 insertions(+), 12 deletions(-) diff --git a/web/vesta/api/CRON.class.php b/web/vesta/api/CRON.class.php index 23571f6e..327492f1 100644 --- a/web/vesta/api/CRON.class.php +++ b/web/vesta/api/CRON.class.php @@ -222,8 +222,10 @@ class CRON extends AjaxHandler $_entities = $request->getParameter('entities'); foreach($_entities as $entity){ - $result = Vesta::execute(Vesta::V_SUSPEND_CRON_JOB, array('USER' => $user, $entity['JOB'])); + $result = Vesta::execute(Vesta::V_SUSPEND_CRON_JOB, array('USER' => $user['uid'], $entity['JOB'])); } + + return $this->reply($result['status'], $result['data']); } public function massiveUnsuspendExecute(Request $request) @@ -232,8 +234,10 @@ class CRON extends AjaxHandler $_entities = $request->getParameter('entities'); foreach($_entities as $entity){ - $result = Vesta::execute(Vesta::V_UNSUSPEND_CRON_JOB, array('USER' => $user, $entity['JOB'])); + $result = Vesta::execute(Vesta::V_UNSUSPEND_CRON_JOB, array('USER' => $user['uid'], $entity['JOB'])); } + + return $this->reply($result['status'], $result['data']); } public function massiveDeleteExecute(Request $request) @@ -242,8 +246,10 @@ class CRON extends AjaxHandler $_entities = $request->getParameter('entities'); foreach($_entities as $entity){ - $result = Vesta::execute(Vesta::V_DEL_CRON_JOB, array('USER' => $user, $entity['JOB'])); + $result = Vesta::execute(Vesta::V_DEL_CRON_JOB, array('USER' => $user['uid'], $entity['JOB'])); } + + return $this->reply($result['status'], $result['data']); } } diff --git a/web/vesta/api/DB.class.php b/web/vesta/api/DB.class.php index 1e1526c8..6d50dca4 100644 --- a/web/vesta/api/DB.class.php +++ b/web/vesta/api/DB.class.php @@ -163,8 +163,10 @@ class DB extends AjaxHandler $_entities = $request->getParameter('entities'); foreach($_entities as $entity){ - $result = Vesta::execute(Vesta::V_SUSPEND_DB_BASE, array('USER' => $user, $entity['DB'])); + $result = Vesta::execute(Vesta::V_SUSPEND_DB_BASE, array('USER' => $user['uid'], $entity['DB'])); } + + return $this->reply($result['status'], $result['data']); } public function massiveUnsuspendExecute(Request $request) @@ -173,8 +175,10 @@ class DB extends AjaxHandler $_entities = $request->getParameter('entities'); foreach($_entities as $entity){ - $result = Vesta::execute(Vesta::V_UNSUSPEND_DB_BASE, array('USER' => $user, $entity['DB'])); + $result = Vesta::execute(Vesta::V_UNSUSPEND_DB_BASE, array('USER' => $user['uid'], $entity['DB'])); } + + return $this->reply($result['status'], $result['data']); } public function massiveDeleteExecute(Request $request) @@ -183,8 +187,10 @@ class DB extends AjaxHandler $_entities = $request->getParameter('entities'); foreach($_entities as $entity){ - $result = Vesta::execute(Vesta::V_DEL_DB_BASE, array('USER' => $user, $entity['DB'])); + $result = Vesta::execute(Vesta::V_DEL_DB_BASE, array('USER' => $user['uid'], $entity['DB'])); } + + return $this->reply($result['status'], $result['data']); } } \ No newline at end of file diff --git a/web/vesta/api/DNS.class.php b/web/vesta/api/DNS.class.php index 429357b3..066523bf 100644 --- a/web/vesta/api/DNS.class.php +++ b/web/vesta/api/DNS.class.php @@ -420,8 +420,10 @@ class DNS extends AjaxHandler $_entities = $request->getParameter('entities'); foreach($_entities as $entity){ - $result = Vesta::execute(Vesta::V_SUSPEND_DNS_DOMAIN, array('USER' => $user, $entity['DNS_DOMAIN'])); + $result = Vesta::execute(Vesta::V_SUSPEND_DNS_DOMAIN, array('USER' => $user['uid'], $entity['DNS_DOMAIN'])); } + + return $this->reply($result['status'], $result['data']); } public function massiveUnsuspendExecute(Request $request) @@ -430,8 +432,10 @@ class DNS extends AjaxHandler $_entities = $request->getParameter('entities'); foreach($_entities as $entity){ - $result = Vesta::execute(Vesta::V_UNUSPEND_DNS_DOMAIN, array('USER' => $user, $entity['DNS_DOMAIN'])); + $result = Vesta::execute(Vesta::V_UNUSPEND_DNS_DOMAIN, array('USER' => $user['uid'], $entity['DNS_DOMAIN'])); } + + return $this->reply($result['status'], $result['data']); } public function massiveDeleteExecute(Request $request) @@ -440,7 +444,9 @@ class DNS extends AjaxHandler $_entities = $request->getParameter('entities'); foreach($_entities as $entity){ - $result = Vesta::execute(Vesta::V_DEL_DNS_DOMAIN, array('USER' => $user, $entity['DNS_DOMAIN'])); + $result = Vesta::execute(Vesta::V_DEL_DNS_DOMAIN, array('USER' => $user['uid'], $entity['DNS_DOMAIN'])); } + + return $this->reply($result['status'], $result['data']); } } diff --git a/web/vesta/api/USER.class.php b/web/vesta/api/USER.class.php index 8674743e..c3a0b0de 100644 --- a/web/vesta/api/USER.class.php +++ b/web/vesta/api/USER.class.php @@ -338,6 +338,8 @@ class USER extends AjaxHandler foreach($_entities as $entity){ $result = Vesta::execute(Vesta::V_SUSPEND_SYS_USER, array('USER' => $entity['LOGIN_NAME'])); } + + return $this->reply($result['status'], $result['data']); } public function massiveUnsuspendExecute(Request $request) @@ -347,6 +349,8 @@ class USER extends AjaxHandler foreach($_entities as $entity){ $result = Vesta::execute(Vesta::V_UNSUSPEND_SYS_USER, array('USER' => $entity['LOGIN_NAME'])); } + + return $this->reply($result['status'], $result['data']); } public function massiveDeleteExecute(Request $request) @@ -356,17 +360,22 @@ class USER extends AjaxHandler foreach($_entities as $entity){ $result = Vesta::execute(Vesta::V_DEL_SYS_USER, array('USER' => $entity['LOGIN_NAME'])); } + + return $this->reply($result['status'], $result['data']); } public function loginAsExecute(Request $request) { $_user = $request->getParameter('user'); VestaSession::loginAs($_user); + + return $this->reply(TRUE, ''); } public function logoutAsExecute(Request $request) { VestaSession::logoutAs(); + return $this->reply(TRUE, ''); } diff --git a/web/vesta/api/WEB_DOMAIN.class.php b/web/vesta/api/WEB_DOMAIN.class.php index afe4c8cd..416ae487 100644 --- a/web/vesta/api/WEB_DOMAIN.class.php +++ b/web/vesta/api/WEB_DOMAIN.class.php @@ -511,8 +511,10 @@ class WEB_DOMAIN extends AjaxHandler $_entities = $request->getParameter('entities'); foreach($_entities as $entity){ - $result = Vesta::execute(Vesta::V_SUSPEND_WEB_DOMAIN, array('USER' => $user, $entity['DOMAIN'])); + $result = Vesta::execute(Vesta::V_SUSPEND_WEB_DOMAIN, array('USER' => $user['uid'], $entity['DOMAIN'])); } + + return $this->reply($result['status'], $result['data']); } public function massiveUnsuspendExecute(Request $request) @@ -521,8 +523,10 @@ class WEB_DOMAIN extends AjaxHandler $_entities = $request->getParameter('entities'); foreach($_entities as $entity){ - $result = Vesta::execute(Vesta::V_UNUSPEND_WEB_DOMAIN, array('USER' => $user, $entity['DOMAIN'])); + $result = Vesta::execute(Vesta::V_UNUSPEND_WEB_DOMAIN, array('USER' => $user['uid'], $entity['DOMAIN'])); } + + return $this->reply($result['status'], $result['data']); } public function massiveDeleteExecute(Request $request) @@ -531,8 +535,10 @@ class WEB_DOMAIN extends AjaxHandler $_entities = $request->getParameter('entities'); foreach($_entities as $entity){ - $result = Vesta::execute(Vesta::V_DEL_WEB_DOMAIN, array('USER' => $user, $entity['DOMAIN'])); + $result = Vesta::execute(Vesta::V_DEL_WEB_DOMAIN, array('USER' => $user['uid'], $entity['DOMAIN'])); } + + return $this->reply($result['status'], $result['data']); } }