Skip to content

Commit 9ddd0d2

Browse files
committed
added success response handling to the deactivate calls
1 parent 9148e76 commit 9ddd0d2

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

src/Plugin.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public static function getDeactivate(GenericEvent $event)
113113
if ($event['category'] == get_service_define('CLOUDLINUX')) {
114114
myadmin_log(self::$module, 'info', 'Cloudlinux Deactivation', __LINE__, __FILE__, self::$module, $serviceClass->getId());
115115
function_requirements('deactivate_cloudlinux');
116-
deactivate_cloudlinux($serviceClass->getIp(), $event['field1']);
116+
$event['success']= deactivate_cloudlinux($serviceClass->getIp(), $event['field1']);
117117
$event->stopPropagation();
118118
}
119119
}
@@ -127,7 +127,7 @@ public static function getDeactivateIp(GenericEvent $event)
127127
if ($event['category'] == get_service_define('CLOUDLINUX')) {
128128
myadmin_log(self::$module, 'info', 'Cloudlinux Deactivation', __LINE__, __FILE__, self::$module, $serviceClass->getId());
129129
function_requirements('deactivate_cloudlinux');
130-
deactivate_cloudlinux($serviceClass->getIp());
130+
$event['success'] = deactivate_cloudlinux($serviceClass->getIp());
131131
$event->stopPropagation();
132132
}
133133
}

src/cloudlinux.inc.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ function deactivate_cloudlinux($ipAddress, $type = false)
4343
}
4444
request_log('licenses', false, __FUNCTION__, 'cloudlinux', 'removeLicense', [$ipAddress, $type], $response);
4545
myadmin_log('cloudlinux', 'info', "Deactivate CloudLinux({$ipAddress}, {$type}) Resposne: ".json_encode($response), __LINE__, __FILE__);
46+
return true;
4647
}
4748

4849
/**
@@ -51,5 +52,5 @@ function deactivate_cloudlinux($ipAddress, $type = false)
5152
*/
5253
function deactivate_kcare($ipAddress)
5354
{
54-
deactivate_cloudlinux($ipAddress, 16);
55+
return deactivate_cloudlinux($ipAddress, 16);
5556
}

0 commit comments

Comments
 (0)