@@ -158,7 +158,7 @@ public function addExecute(Request $request)
158158 }
159159 }
160160
161- /* if ($_s['SSL']) {
161+ /* if ($_s['SSL']) {
162162 $params = array(
163163 'USER' => $user['uid'],
164164 'DOMAIN' => $_s['DOMAIN'],
@@ -178,7 +178,7 @@ public function addExecute(Request $request)
178178 }
179179 if ($_s['SSL_HOME']) {
180180
181- }*/
181+ }*/
182182
183183 /*if (!empty($_s['DNS'])) {
184184 $params = array(
@@ -194,7 +194,7 @@ public function addExecute(Request $request)
194194 $result = $dns->addExecute($params);
195195 if (!$result['status']) {
196196 $this->errors['DNS_DOMAIN'] = array($result['error_code'] => $result['error_message']);
197- }
197+ }
198198 }*/
199199
200200
@@ -264,25 +264,42 @@ public function changeExecute(Request $request)
264264
265265 $ _old ['ELOG ' ] = $ _old ['ELOG ' ] == 'yes ' ? 'on ' : 'off ' ;
266266 $ _old ['CGI ' ] = $ _old ['CGI ' ] == 'yes ' ? 'on ' : 'off ' ;
267- $ _old ['AUTH ' ] = $ _old ['AUTH ' ] == 'yes ' ? 'on ' : 'off ' ;
267+ $ _old ['AUTH ' ] = $ _old ['AUTH ' ] == 'yes ' ? 'on ' : 'off ' ;
268268 $ _old ['SSL ' ] = $ _old ['SSL ' ] == 'yes ' ? 'on ' : 'off ' ;
269269
270270 $ user = $ this ->getLoggedUser ();
271271 $ _DOMAIN = $ _new ['DOMAIN ' ];
272272
273- if ($ _new ['SUSPEND ' ] == 'on ' ) {
274- $ result = Vesta::execute (Vesta::V_SUSPEND_WEB_DOMAIN , array ('USER ' => $ user ['uid ' ], 'DOMAIN ' => $ _DOMAIN ));
275- if (!$ result ['status ' ]) {
276- $ this ->status = FALSE ;
277- $ this ->errors ['SUSPEND ' ] = array ($ result ['error_code ' ] => $ result ['error_message ' ]);
273+ if ($ _old ['SUSPEND ' ] != $ _new ['SUSPEND ' ]) {
274+ if ($ _new ['SUSPEND ' ] == 'on ' ) {
275+ $ result = Vesta::execute (Vesta::V_SUSPEND_WEB_DOMAIN , array ('USER ' => $ user ['uid ' ], 'DOMAIN ' => $ _DOMAIN ));
276+ if (!$ result ['status ' ]) {
277+ $ this ->status = FALSE ;
278+ $ this ->errors ['SUSPEND ' ] = array ($ result ['error_code ' ] => $ result ['error_message ' ]);
279+ }
280+ // return $this->reply($result['status']);
278281 }
279- // return $this->reply($result['status']);
280- }
281- else {
282- $ result = Vesta::execute (Vesta::V_UNSUSPEND_WEB_DOMAIN , array ('USER ' => $ user ['uid ' ], 'DOMAIN ' => $ _DOMAIN ));
283- if (!$ result ['status ' ]) {
284- $ this ->status = FALSE ;
285- $ this ->errors ['UNSUSPEND ' ] = array ($ result ['error_code ' ] => $ result ['error_message ' ]);
282+ else {
283+ $ result = Vesta::execute (Vesta::V_UNSUSPEND_WEB_DOMAIN , array ('USER ' => $ user ['uid ' ], 'DOMAIN ' => $ _DOMAIN ));
284+ if (!$ result ['status ' ]) {
285+ $ this ->status = FALSE ;
286+ $ this ->errors ['UNSUSPEND ' ] = array ($ result ['error_code ' ] => $ result ['error_message ' ]);
287+ }
288+ }
289+ if ($ _new ['SUSPEND ' ] == 'on ' ) {
290+ $ result = Vesta::execute (Vesta::V_SUSPEND_WEB_DOMAIN , array ('USER ' => $ user ['uid ' ], 'DOMAIN ' => $ _DOMAIN ));
291+ if (!$ result ['status ' ]) {
292+ $ this ->status = FALSE ;
293+ $ this ->errors ['SUSPEND ' ] = array ($ result ['error_code ' ] => $ result ['error_message ' ]);
294+ }
295+ // return $this->reply($result['status']);
296+ }
297+ else {
298+ $ result = Vesta::execute (Vesta::V_UNSUSPEND_WEB_DOMAIN , array ('USER ' => $ user ['uid ' ], 'DOMAIN ' => $ _DOMAIN ));
299+ if (!$ result ['status ' ]) {
300+ $ this ->status = FALSE ;
301+ $ this ->errors ['UNSUSPEND ' ] = array ($ result ['error_code ' ] => $ result ['error_message ' ]);
302+ }
286303 }
287304 }
288305
@@ -422,7 +439,7 @@ public function changeExecute(Request $request)
422439 }
423440 }
424441
425- if ($ _new ['SSL ' ]) {
442+ /* if ($_new['SSL']) {
426443 $params = array(
427444 'USER' => $user['uid'],
428445 'DOMAIN' => $_new['DOMAIN'],
@@ -439,16 +456,19 @@ public function changeExecute(Request $request)
439456 if (!$result['status']) {
440457 $this->errors['SSL'] = array($result['error_code'] => $result['error_message']);
441458 }
442- }
459+ }*/
443460
444- if ($ _s ['SSL_KEY ' ]) {
461+ if (!empty ($ _s ['SSL_KEY ' ])) {
462+ $ ssl_file = tempnam (sys_get_temp_dir (), 'ssl ' );
463+ file_put_contents ($ ssl_file , $ _s ['SSL_KEY ' ]);
464+
445465 $ params = array (
446466 'USER ' => $ user ['uid ' ],
447467 'DOMAIN ' => $ _s ['DOMAIN ' ],
448- 'SSL_KEY ' => $ _s [ ' SSL_KEY ' ]
468+ 'SSL_KEY ' => $ ssl_file
449469 );
450470
451- if ($ _s ['SSL_HOME ' ]) {
471+ if (! empty ( $ _s ['SSL_HOME ' ]) ) {
452472 $ params ['SSL_HOME ' ] = $ _s ['SSL_HOME ' ];
453473 }
454474
@@ -460,6 +480,26 @@ public function changeExecute(Request $request)
460480 }
461481 }
462482
483+
484+ if (!empty ($ _s ['SSL_CERT ' ])) {
485+ $ sslcert_file = tempnam (sys_get_temp_dir (), 'ssl ' );
486+ file_put_contents ($ sslcert_file , $ _s ['SSL_CERT ' ]);
487+
488+ $ params = array (
489+ 'USER ' => $ user ['uid ' ],
490+ 'DOMAIN ' => $ _s ['DOMAIN ' ],
491+ 'SSL_CERT ' => $ sslcert_file
492+ );
493+
494+ $ result = 0 ;
495+ $ result = Vesta::execute (Vesta::V_ADD_WEB_DOMAIN_SSLCERT , $ params );
496+
497+ if (!$ result ['status ' ]) {
498+ $ this ->errors ['SSL_CERT ' ] = array ($ result ['error_code ' ] => $ result ['error_message ' ]);
499+ }
500+ }
501+
502+
463503 return $ this ->reply ($ result ['status ' ], $ result ['data ' ]);
464504 }
465505
@@ -511,7 +551,7 @@ public function massiveSuspendExecute(Request $request)
511551 $ _entities = $ request ->getParameter ('entities ' );
512552
513553 foreach ($ _entities as $ entity ){
514- $ result = Vesta::execute (Vesta::V_SUSPEND_WEB_DOMAIN , array ('USER ' => $ user[ ' uid ' ] , $ entity ['DOMAIN ' ]));
554+ $ result = Vesta::execute (Vesta::V_SUSPEND_WEB_DOMAIN , array ('USER ' => $ user , $ entity ['DOMAIN ' ]));
515555 }
516556
517557 return $ this ->reply ($ result ['status ' ], $ result ['data ' ]);
@@ -523,7 +563,7 @@ public function massiveUnsuspendExecute(Request $request)
523563 $ _entities = $ request ->getParameter ('entities ' );
524564
525565 foreach ($ _entities as $ entity ){
526- $ result = Vesta::execute (Vesta::V_UNUSPEND_WEB_DOMAIN , array ('USER ' => $ user[ ' uid ' ] , $ entity ['DOMAIN ' ]));
566+ $ result = Vesta::execute (Vesta::V_UNUSPEND_WEB_DOMAIN , array ('USER ' => $ user , $ entity ['DOMAIN ' ]));
527567 }
528568
529569 return $ this ->reply ($ result ['status ' ], $ result ['data ' ]);
@@ -535,10 +575,9 @@ public function massiveDeleteExecute(Request $request)
535575 $ _entities = $ request ->getParameter ('entities ' );
536576
537577 foreach ($ _entities as $ entity ){
538- $ result = Vesta::execute (Vesta::V_DEL_WEB_DOMAIN , array ('USER ' => $ user[ ' uid ' ] , $ entity ['DOMAIN ' ]));
578+ $ result = Vesta::execute (Vesta::V_DEL_WEB_DOMAIN , array ('USER ' => $ user , $ entity ['DOMAIN ' ]));
539579 }
540580
541581 return $ this ->reply ($ result ['status ' ], $ result ['data ' ]);
542582 }
543-
544583}
0 commit comments