Skip to content

Commit 46e161e

Browse files
very-twivery-twi
committed
Batch operations backend. Closes hestiacp#8 
1 parent 7d25c63 commit 46e161e

File tree

5 files changed

+45
-12
lines changed

5 files changed

+45
-12
lines changed

‎web/vesta/api/CRON.class.php‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,10 @@ public function massiveSuspendExecute(Request $request)
222222
$_entities = $request->getParameter('entities');
223223

224224
foreach($_entities as $entity){
225-
$result = Vesta::execute(Vesta::V_SUSPEND_CRON_JOB, array('USER' => $user, $entity['JOB']));
225+
$result = Vesta::execute(Vesta::V_SUSPEND_CRON_JOB, array('USER' => $user['uid'], $entity['JOB']));
226226
}
227+
228+
return $this->reply($result['status'], $result['data']);
227229
}
228230

229231
public function massiveUnsuspendExecute(Request $request)
@@ -232,8 +234,10 @@ public function massiveUnsuspendExecute(Request $request)
232234
$_entities = $request->getParameter('entities');
233235

234236
foreach($_entities as $entity){
235-
$result = Vesta::execute(Vesta::V_UNSUSPEND_CRON_JOB, array('USER' => $user, $entity['JOB']));
237+
$result = Vesta::execute(Vesta::V_UNSUSPEND_CRON_JOB, array('USER' => $user['uid'], $entity['JOB']));
236238
}
239+
240+
return $this->reply($result['status'], $result['data']);
237241
}
238242

239243
public function massiveDeleteExecute(Request $request)
@@ -242,8 +246,10 @@ public function massiveDeleteExecute(Request $request)
242246
$_entities = $request->getParameter('entities');
243247

244248
foreach($_entities as $entity){
245-
$result = Vesta::execute(Vesta::V_DEL_CRON_JOB, array('USER' => $user, $entity['JOB']));
249+
$result = Vesta::execute(Vesta::V_DEL_CRON_JOB, array('USER' => $user['uid'], $entity['JOB']));
246250
}
251+
252+
return $this->reply($result['status'], $result['data']);
247253
}
248254

249255
}

‎web/vesta/api/DB.class.php‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,10 @@ public function massiveSuspendExecute(Request $request)
163163
$_entities = $request->getParameter('entities');
164164

165165
foreach($_entities as $entity){
166-
$result = Vesta::execute(Vesta::V_SUSPEND_DB_BASE, array('USER' => $user, $entity['DB']));
166+
$result = Vesta::execute(Vesta::V_SUSPEND_DB_BASE, array('USER' => $user['uid'], $entity['DB']));
167167
}
168+
169+
return $this->reply($result['status'], $result['data']);
168170
}
169171

170172
public function massiveUnsuspendExecute(Request $request)
@@ -173,8 +175,10 @@ public function massiveUnsuspendExecute(Request $request)
173175
$_entities = $request->getParameter('entities');
174176

175177
foreach($_entities as $entity){
176-
$result = Vesta::execute(Vesta::V_UNSUSPEND_DB_BASE, array('USER' => $user, $entity['DB']));
178+
$result = Vesta::execute(Vesta::V_UNSUSPEND_DB_BASE, array('USER' => $user['uid'], $entity['DB']));
177179
}
180+
181+
return $this->reply($result['status'], $result['data']);
178182
}
179183

180184
public function massiveDeleteExecute(Request $request)
@@ -183,8 +187,10 @@ public function massiveDeleteExecute(Request $request)
183187
$_entities = $request->getParameter('entities');
184188

185189
foreach($_entities as $entity){
186-
$result = Vesta::execute(Vesta::V_DEL_DB_BASE, array('USER' => $user, $entity['DB']));
190+
$result = Vesta::execute(Vesta::V_DEL_DB_BASE, array('USER' => $user['uid'], $entity['DB']));
187191
}
192+
193+
return $this->reply($result['status'], $result['data']);
188194
}
189195

190196
}

‎web/vesta/api/DNS.class.php‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,10 @@ public function massiveSuspendExecute(Request $request)
420420
$_entities = $request->getParameter('entities');
421421

422422
foreach($_entities as $entity){
423-
$result = Vesta::execute(Vesta::V_SUSPEND_DNS_DOMAIN, array('USER' => $user, $entity['DNS_DOMAIN']));
423+
$result = Vesta::execute(Vesta::V_SUSPEND_DNS_DOMAIN, array('USER' => $user['uid'], $entity['DNS_DOMAIN']));
424424
}
425+
426+
return $this->reply($result['status'], $result['data']);
425427
}
426428

427429
public function massiveUnsuspendExecute(Request $request)
@@ -430,8 +432,10 @@ public function massiveUnsuspendExecute(Request $request)
430432
$_entities = $request->getParameter('entities');
431433

432434
foreach($_entities as $entity){
433-
$result = Vesta::execute(Vesta::V_UNUSPEND_DNS_DOMAIN, array('USER' => $user, $entity['DNS_DOMAIN']));
435+
$result = Vesta::execute(Vesta::V_UNUSPEND_DNS_DOMAIN, array('USER' => $user['uid'], $entity['DNS_DOMAIN']));
434436
}
437+
438+
return $this->reply($result['status'], $result['data']);
435439
}
436440

437441
public function massiveDeleteExecute(Request $request)
@@ -440,7 +444,9 @@ public function massiveDeleteExecute(Request $request)
440444
$_entities = $request->getParameter('entities');
441445

442446
foreach($_entities as $entity){
443-
$result = Vesta::execute(Vesta::V_DEL_DNS_DOMAIN, array('USER' => $user, $entity['DNS_DOMAIN']));
447+
$result = Vesta::execute(Vesta::V_DEL_DNS_DOMAIN, array('USER' => $user['uid'], $entity['DNS_DOMAIN']));
444448
}
449+
450+
return $this->reply($result['status'], $result['data']);
445451
}
446452
}

‎web/vesta/api/USER.class.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,8 @@ public function massiveSuspendExecute(Request $request)
338338
foreach($_entities as $entity){
339339
$result = Vesta::execute(Vesta::V_SUSPEND_SYS_USER, array('USER' => $entity['LOGIN_NAME']));
340340
}
341+
342+
return $this->reply($result['status'], $result['data']);
341343
}
342344

343345
public function massiveUnsuspendExecute(Request $request)
@@ -347,6 +349,8 @@ public function massiveUnsuspendExecute(Request $request)
347349
foreach($_entities as $entity){
348350
$result = Vesta::execute(Vesta::V_UNSUSPEND_SYS_USER, array('USER' => $entity['LOGIN_NAME']));
349351
}
352+
353+
return $this->reply($result['status'], $result['data']);
350354
}
351355

352356
public function massiveDeleteExecute(Request $request)
@@ -356,17 +360,22 @@ public function massiveDeleteExecute(Request $request)
356360
foreach($_entities as $entity){
357361
$result = Vesta::execute(Vesta::V_DEL_SYS_USER, array('USER' => $entity['LOGIN_NAME']));
358362
}
363+
364+
return $this->reply($result['status'], $result['data']);
359365
}
360366

361367
public function loginAsExecute(Request $request)
362368
{
363369
$_user = $request->getParameter('user');
364370
VestaSession::loginAs($_user);
371+
372+
return $this->reply(TRUE, '');
365373
}
366374

367375
public function logoutAsExecute(Request $request)
368376
{
369377
VestaSession::logoutAs();
378+
return $this->reply(TRUE, '');
370379
}
371380

372381

‎web/vesta/api/WEB_DOMAIN.class.php‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -511,8 +511,10 @@ public function massiveSuspendExecute(Request $request)
511511
$_entities = $request->getParameter('entities');
512512

513513
foreach($_entities as $entity){
514-
$result = Vesta::execute(Vesta::V_SUSPEND_WEB_DOMAIN, array('USER' => $user, $entity['DOMAIN']));
514+
$result = Vesta::execute(Vesta::V_SUSPEND_WEB_DOMAIN, array('USER' => $user['uid'], $entity['DOMAIN']));
515515
}
516+
517+
return $this->reply($result['status'], $result['data']);
516518
}
517519

518520
public function massiveUnsuspendExecute(Request $request)
@@ -521,8 +523,10 @@ public function massiveUnsuspendExecute(Request $request)
521523
$_entities = $request->getParameter('entities');
522524

523525
foreach($_entities as $entity){
524-
$result = Vesta::execute(Vesta::V_UNUSPEND_WEB_DOMAIN, array('USER' => $user, $entity['DOMAIN']));
526+
$result = Vesta::execute(Vesta::V_UNUSPEND_WEB_DOMAIN, array('USER' => $user['uid'], $entity['DOMAIN']));
525527
}
528+
529+
return $this->reply($result['status'], $result['data']);
526530
}
527531

528532
public function massiveDeleteExecute(Request $request)
@@ -531,8 +535,10 @@ public function massiveDeleteExecute(Request $request)
531535
$_entities = $request->getParameter('entities');
532536

533537
foreach($_entities as $entity){
534-
$result = Vesta::execute(Vesta::V_DEL_WEB_DOMAIN, array('USER' => $user, $entity['DOMAIN']));
538+
$result = Vesta::execute(Vesta::V_DEL_WEB_DOMAIN, array('USER' => $user['uid'], $entity['DOMAIN']));
535539
}
540+
541+
return $this->reply($result['status'], $result['data']);
536542
}
537543

538544
}

0 commit comments

Comments
 (0)