Skip to content

Commit 1aa6f48

Browse files
fizikiukasfizikiukas
authored
Merge pull request #1 from time4vps/fix/emergency-console
Fix Emergency Console
2 parents d5a3af7 + a76b02b commit 1aa6f48

File tree

2 files changed

+26
-23
lines changed

2 files changed

+26
-23
lines changed

‎components/modules/time4vps/time4vps.php

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public function time4vps_InitAPI($params)
104104
Endpoint::DebugFunction(function ($args, $request, $response) use ($debug) {
105105
$id = hash('crc32', microtime(true));
106106
$benchmark = $debug->benchmark();
107-
$this->log($args[1], json_encode(array('Request' => $request,'Response' => (string) $response , 'time taken' => $benchmark), true), 'input', true);
107+
$this->log($args[1], json_encode(array('Request' => $request, 'Response' => (string)$response, 'time taken' => $benchmark), true), 'input', true);
108108
});
109109
}
110110

@@ -254,6 +254,7 @@ public function tabserviceStats($package, $service, array $get = null, array $po
254254
$this->view->setDefaultView('components' . DS . 'modules' . DS . 'time4vps' . DS);
255255
return $this->view->fetch();
256256
}
257+
257258
/**
258259
* Client Area Server Reboot
259260
*
@@ -281,7 +282,7 @@ public function tabReboot($package, $service, array $get = null, array $post = n
281282
$last_result = null;
282283
$error = null;
283284
if (!empty($_POST['confirm'])) {
284-
$error = time4vps_Reboot($params);
285+
$error = time4vps_Reboot($params);
285286
if ($error === 'success') {
286287
time4vps_MarkServerDetailsObsolete($params);
287288
return;
@@ -329,7 +330,7 @@ public function tabResetpassword($package, $service, array $get = null, array $p
329330
$last_result = null;
330331
$error = null;
331332
if (!empty($post['confirm'])) {
332-
$error = time4vps_ResetPassword($params);
333+
$error = time4vps_ResetPassword($params);
333334
if ($error === 'success') {
334335
time4vps_MarkServerDetailsObsolete($params);
335336
return;
@@ -630,7 +631,7 @@ public function tabEmergencyConsole($package, $service, array $get = null, array
630631
// Load the helpers required for this view
631632
Loader::loadHelpers($this, ['Form', 'Html']);
632633
$service_fields = $this->serviceFieldsToObject($service->fields);
633-
if(isset($service_fields->time4vps_domain) && $service_fields->time4vps_domain == 'serverhost.name'){
634+
if (isset($service_fields->time4vps_domain) && $service_fields->time4vps_domain == 'serverhost.name') {
634635
$row = $this->getModuleRow();
635636
$params = [];
636637
$params['serverhttpprefix'] = isset($row->meta->use_ssl) && $row->meta->use_ssl == true ? 'https' : 'http';
@@ -640,13 +641,15 @@ public function tabEmergencyConsole($package, $service, array $get = null, array
640641
$params['service_id'] = $service->id;
641642
time4vps_InitAPI($params);
642643
$remote_service = time4vps_GetServiceDetails($params); // remote service details
643-
$service_fields->time4vps_domain = is_array($remote_service) && isset($remote_service['domain']) && !empty($remote_service['domain']) ? $remote_service['domain']: 'serverhost.name';
644+
$service_fields->time4vps_domain = is_array($remote_service) && isset($remote_service['domain']) && !empty($remote_service['domain']) ? $remote_service['domain'] : 'serverhost.name';
644645
}
645646
$last_result = null;
646647
$error = null;
647648
if (!empty($post['timeout'])) {
649+
$error = time4vps_EmergencyConsole($params, $post['timeout']);
648650
if ($error === 'success') {
649651
time4vps_MarkServerDetailsObsolete($params);
652+
return;
650653
}
651654
}
652655
try {
@@ -682,7 +685,7 @@ public function tabCancelService($package, $service, array $get = null, array $p
682685
// Load the helpers required for this view
683686
Loader::loadHelpers($this, ['Form', 'Html']);
684687
$service_fields = $this->serviceFieldsToObject($service->fields);
685-
if(isset($service_fields->time4vps_domain) && $service_fields->time4vps_domain == 'serverhost.name'){
688+
if (isset($service_fields->time4vps_domain) && $service_fields->time4vps_domain == 'serverhost.name') {
686689
$row = $this->getModuleRow();
687690
$params = [];
688691
$params['serverhttpprefix'] = isset($row->meta->use_ssl) && $row->meta->use_ssl == true ? 'https' : 'http';
@@ -692,7 +695,7 @@ public function tabCancelService($package, $service, array $get = null, array $p
692695
$params['service_id'] = $service->id;
693696
time4vps_InitAPI($params);
694697
$remote_service = time4vps_GetServiceDetails($params); // remote service details
695-
$service_fields->time4vps_domain = is_array($remote_service) && isset($remote_service['domain']) && !empty($remote_service['domain']) ? $remote_service['domain']: 'serverhost.name';
698+
$service_fields->time4vps_domain = is_array($remote_service) && isset($remote_service['domain']) && !empty($remote_service['domain']) ? $remote_service['domain'] : 'serverhost.name';
696699
}
697700
// Perform the password reset
698701
if (!empty($post)) {
@@ -885,8 +888,8 @@ public function getPackageFields($vars = null)
885888
$params['serverusername'] = isset($response->meta) ? $response->meta->user_name : $response->user_name;
886889
$params['serverpassword'] = isset($response->meta->password) ? $response->meta->password : $response->password;
887890
$params['serveraccesshash'] = isset($response->meta->access_hash) ? $response->meta->access_hash : $response->access_hash;
888-
$params['serversecure'] = ((isset($response->meta->use_ssl) && $response->meta->use_ssl == true) || (isset($response->use_ssl) && $response->use_ssl == true) ) ? '1' : '0';
889-
$params['serverhttpprefix'] = ((isset($response->meta->use_ssl) && $response->meta->use_ssl == true) || (isset($response->use_ssl) && $response->use_ssl == true) ) ? 'https' : 'http';
891+
$params['serversecure'] = ((isset($response->meta->use_ssl) && $response->meta->use_ssl == true) || (isset($response->use_ssl) && $response->use_ssl == true)) ? '1' : '0';
892+
$params['serverhttpprefix'] = ((isset($response->meta->use_ssl) && $response->meta->use_ssl == true) || (isset($response->use_ssl) && $response->use_ssl == true)) ? 'https' : 'http';
890893
$available_products = $available_products + $this->time4vps_ProductLoaderFunction($params); //Append products to existing Array
891894
$available_scripts = $available_scripts + $this->time4vps_InitScriptLoaderFunction($params); // Append init scripts to existing Array
892895
}
@@ -952,7 +955,7 @@ public function getPackageFields($vars = null)
952955
$configoption4_note = $fields->label(
953956
Language::_('time4vps.package_fields.configoption4_note', true),
954957
'time4vps_configoption4_note',
955-
array( 'id' => "time4vps_configoption4_note")
958+
array('id' => "time4vps_configoption4_note")
956959
);
957960
$fields->setField($configoption4_note);
958961

@@ -973,19 +976,19 @@ public function getPackageFields($vars = null)
973976
$Component_map_note = $fields->label(
974977
Language::_('time4vps.package_fields.Component_map_note', true),
975978
'time4vps_Component_map_note',
976-
array( 'id' => "time4vps_Component_map_note")
979+
array('id' => "time4vps_Component_map_note")
977980
);
978981
$fields->setField($Component_map_note);
979982
//Advance mode link
980983
$advance_mode = $fields->label(
981984
Language::_('time4vps.package_fields.advance_mode', true),
982985
'time4vps_advance_mode',
983-
array( 'id' => "time4vps_advance_mode" , 'style' => "text-decoration: underline;")
986+
array('id' => "time4vps_advance_mode", 'style' => "text-decoration: underline;")
984987
);
985988
$normal_mode = $fields->label(
986989
Language::_('time4vps.package_fields.normal_mode', true),
987990
'time4vps_normal_mode',
988-
array( 'id' => "time4vps_normal_mode" , 'style' => "text-decoration: underline; display:none;")
991+
array('id' => "time4vps_normal_mode", 'style' => "text-decoration: underline; display:none;")
989992
);
990993
$fields->setField($advance_mode);
991994
$fields->setField($normal_mode);
@@ -1117,8 +1120,8 @@ public function AddServerPackages($module, $module_id, $module_row)
11171120
$vars = [
11181121
"names" => [
11191122
[
1120-
"lang" => 'en_us',
1121-
"name" => $product['name']
1123+
"lang" => 'en_us',
1124+
"name" => $product['name']
11221125
]
11231126
],
11241127
"descriptions" => [
@@ -1166,8 +1169,8 @@ public function AddServerPackages($module, $module_id, $module_row)
11661169
"groups" => [],
11671170
"group_names" => [
11681171
[
1169-
"lang" => "en_us",
1170-
"name" => ""
1172+
"lang" => "en_us",
1173+
"name" => ""
11711174
]
11721175
],
11731176
"save" => "Create Package",
@@ -1262,7 +1265,7 @@ public function addModuleRow(array &$vars)
12621265
$params['serverpassword'] = $vars['password'];
12631266
$response = $this->time4vps_TestConnection($params);
12641267
if ($response['success']) {
1265-
$meta_fields = ['server_name', 'host_name', 'user_name', 'password', 'access_hash','use_ssl'];
1268+
$meta_fields = ['server_name', 'host_name', 'user_name', 'password', 'access_hash', 'use_ssl'];
12661269
$encrypted_fields = ['password'];
12671270

12681271
// Set unspecified checkboxes
@@ -1306,7 +1309,7 @@ public function addModuleRow(array &$vars)
13061309
*/
13071310
public function editModuleRow($module_row, array &$vars)
13081311
{
1309-
$meta_fields = ['server_name', 'host_name', 'user_name', 'password', 'access_hash','use_ssl'];
1312+
$meta_fields = ['server_name', 'host_name', 'user_name', 'password', 'access_hash', 'use_ssl'];
13101313
$encrypted_fields = ['password'];
13111314

13121315
// Set unspecified checkboxes
@@ -1376,7 +1379,7 @@ public function getServiceName($service)
13761379
$params['service_id'] = $service->id;
13771380
time4vps_InitAPI($params);
13781381
$remote_service = time4vps_GetServiceDetails($params); // service details
1379-
$service_name = is_array($remote_service) && isset($remote_service['domain']) && !empty($remote_service['domain']) ? $remote_service['domain']: 'serverhost.name';
1382+
$service_name = is_array($remote_service) && isset($remote_service['domain']) && !empty($remote_service['domain']) ? $remote_service['domain'] : 'serverhost.name';
13801383
} else {
13811384
$service_name = 'serverhost.name';
13821385
}
@@ -1764,7 +1767,7 @@ public function addService($package, array $vars = null, $parent_package = null,
17641767
$vars['time4vps_billing_cycle'] = $package->pricing[0]->period;
17651768
// Generate username/password
17661769
if (array_key_exists('time4vps_domain', $vars)) {
1767-
Loader::loadModels($this, ['Clients','Packages']);
1770+
Loader::loadModels($this, ['Clients', 'Packages']);
17681771

17691772
// Strip "www." from beginning of domain if present
17701773

@@ -1993,7 +1996,7 @@ public function cancelService($package, $service, $parent_package = null, $paren
19931996
$params['serverhostname'] = $row->meta->host_name;
19941997
$params['serverusername'] = $row->meta->user_name;
19951998
$params['serverpassword'] = $row->meta->password;
1996-
$params = array('accountid' => $service->id_value, 'serviceid' => $service->id,'userid' => $service->client_id, 'domain' => $service_fields->time4vps_domain, 'username' => $service_fields->time4vps_username, 'password' => $service_fields->time4vps_password, 'packageid' => $service->package->id, 'status' => $service->package->status, 'type' => 'server', 'producttype' => 'server', 'moduletype' => 'time4vps', 'configoption3' => $service->package->meta->os_list);
1999+
$params = array('accountid' => $service->id_value, 'serviceid' => $service->id, 'userid' => $service->client_id, 'domain' => $service_fields->time4vps_domain, 'username' => $service_fields->time4vps_username, 'password' => $service_fields->time4vps_password, 'packageid' => $service->package->id, 'status' => $service->package->status, 'type' => 'server', 'producttype' => 'server', 'moduletype' => 'time4vps', 'configoption3' => $service->package->meta->os_list);
19972000
return time4vps_TerminateAccount($params);
19982001
}
19992002
return null;

‎components/modules/time4vps/views/default/tab_emergencyconsole.pdt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<?php if ($last_result['completed']) { ?>
2020
<p>Your last emergency console was launched at <strong><?php echo date('d/M/Y h:i:s', strtotime($last_result['completed'])) ?></strong>:</p>
21-
<pre><?php echo $last_result['results']; ?></pre>
21+
<pre><strong><?php echo $last_result['results']; ?></strong></pre>
2222
<hr />
2323
<?php } ?>
2424

0 commit comments

Comments
 (0)