fixing a few problems

Author: detain

src/Plugin.php

@@ -308,8 +308,7 @@ function_requirements('whm_api');
 			$whm->set_user($user);
 			$whm->set_hash($hash);
 			//$whm = whm_api('faith.interserver.net');
-			$field1 = explode(',', $service_types[$serviceClass->getType()]['services_field1']);
-			if (in_array('reseller', $field1))
+			if (in_array('reseller', $event['field1']))
 				$response = json_decode($whm->suspendreseller($serviceClass->getUsername(), 'Canceled Service'), true);
 			else
 				$response = json_decode($whm->suspendacct($serviceClass->getUsername(), 'Canceled Service'), true);
@@ -324,7 +323,6 @@ public static function getTerminate(GenericEvent $event) {
 			$serviceClass = $event->getSubject();
 			$serviceTypes = run_event('get_service_types', FALSE, self::$module);
 			$settings = get_module_settings(self::$module);
-			$extra = run_event('parse_service_extra', $serviceClass->getExtra(), self::$module);
 			$serverdata = get_service_master($serviceClass->getServer(), self::$module);
 			$hash = $serverdata[$settings['PREFIX'].'_key'];
 			$ip = $serverdata[$settings['PREFIX'].'_ip'];
@@ -340,8 +338,7 @@ function_requirements('whm_api');
 			$whm->set_hash($hash);
 			//$whm = whm_api('faith.interserver.net');
 			if (trim($serviceClass->getUsername()) != '') {
-				$field1 = explode(',', $service_types[$serviceClass->getType()]['services_field1']);
-				if (in_array('reseller', $field1))
+				if (in_array('reseller', $event['field1']))
 					$response = json_decode($whm->terminatereseller($serviceClass->getUsername(), true));
 				else
 					$response = json_decode($whm->removeacct($serviceClass->getUsername(), false));
@@ -350,7 +347,7 @@ function_requirements('whm_api');
 				myadmin_log(self::$module, 'info', "Skipping WHMAPI/Server Removal for {$serviceClass->getHostname()} because username is blank", __LINE__, __FILE__);
 			$dnsr = json_decode($whm->dumpzone($serviceClass->getHostname()));
 			if ($dnsr->result[0]->status == 1) {
-				$db->query("select * from {$settings['TABLE']} where {$settings['PREFIX']}_hostname='{$serviceClass->getHostname()}' and {$settings['PREFIX']}_id != {$id} and {$settings['PREFIX']}_status = 'active'", __LINE__, __FILE__);
+				$db->query("select * from {$settings['TABLE']} where {$settings['PREFIX']}_hostname='{$serviceClass->getHostname()}' and {$settings['PREFIX']}_id != {$serviceClass->getId()} and {$settings['PREFIX']}_status = 'active'", __LINE__, __FILE__);
 				if ($db->num_rows() == 0) {
 					myadmin_log(self::$module, 'info', "Removing Hanging DNS entry for {$serviceClass->getHostname()}", __LINE__, __FILE__);
 					$whm->killdns($serviceClass->getHostname());