Skip to content

Commit 7b886d0

Browse files
detaindetain
committed
lots of updates to myadmin_log calls adding the optional module and service id parameters in applicable places
1 parent c1ac8ec commit 7b886d0

1 file changed

Lines changed: 31 additions & 31 deletions

File tree

‎src/Plugin.php‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ function_requirements('whm_api');
8888
$whm->set_hash($hash);
8989
} catch (\Exception $e) {
9090
$event['success'] = false;
91-
myadmin_log('cpanel', 'error', $e->getMessage(), __LINE__, __FILE__);
91+
myadmin_log('cpanel', 'error', $e->getMessage(), __LINE__, __FILE__, self::$module, $serviceClass->getId());
9292
$event->stopPropagation();
9393
return;
9494
}
@@ -126,26 +126,26 @@ function_requirements('whm_api');
126126
'password' => $password,
127127
'contactemail' => $event['email']
128128
]);
129-
myadmin_log(self::$module, 'info', json_encode($options), __LINE__, __FILE__);
129+
myadmin_log(self::$module, 'info', json_encode($options), __LINE__, __FILE__, self::$module, $serviceClass->getId());
130130
try {
131131
$response = $whm->xmlapi_query('createacct', $options);
132132
} catch (\Exception $e) {
133133
$event['success'] = false;
134-
myadmin_log('cpanel', 'error', 'Caught Exception from initial createacct call: '.$e->getMessage(), __LINE__, __FILE__);
134+
myadmin_log('cpanel', 'error', 'Caught Exception from initial createacct call: '.$e->getMessage(), __LINE__, __FILE__, self::$module, $serviceClass->getId());
135135
$event->stopPropagation();
136136
return;
137137
}
138138
request_log(self::$module, $serviceClass->getCustid(), __FUNCTION__, 'cpanel', 'createacct', $options, $response);
139-
myadmin_log(self::$module, 'info', 'Response: '.str_replace('\n', '', strip_tags($response)), __LINE__, __FILE__);
139+
myadmin_log(self::$module, 'info', 'Response: '.str_replace('\n', '', strip_tags($response)), __LINE__, __FILE__, self::$module, $serviceClass->getId());
140140
$response = json_decode($response, true);
141141
if (mb_substr($response['result'][0]['statusmsg'], 0, 19) == 'Sorry, the password') {
142142
while (mb_substr($response['result'][0]['statusmsg'], 0, 19) == 'Sorry, the password') {
143143
$password = generateRandomString(10, 2, 2, 2, 1);
144144
$options['password'] = $password;
145-
myadmin_log(self::$module, 'info', "Trying Password {$options['password']}", __LINE__, __FILE__);
145+
myadmin_log(self::$module, 'info', "Trying Password {$options['password']}", __LINE__, __FILE__, self::$module, $serviceClass->getId());
146146
$response = $whm->xmlapi_query('createacct', $options);
147147
request_log(self::$module, $serviceClass->getCustid(), __FUNCTION__, 'cpanel', 'createacct', $options, $response);
148-
myadmin_log(self::$module, 'info', 'Response: '.str_replace('\n', "\n", $response), __LINE__, __FILE__);
148+
myadmin_log(self::$module, 'info', 'Response: '.str_replace('\n', "\n", $response), __LINE__, __FILE__, self::$module, $serviceClass->getId());
149149
$response = json_decode($response, true);
150150
}
151151
$GLOBALS['tf']->history->add($settings['PREFIX'], 'password', $serviceClass->getId(), $options['password']);
@@ -155,10 +155,10 @@ function_requirements('whm_api');
155155
$username .= 'a';
156156
$username = mb_substr($username, 1);
157157
$options['username'] = $username;
158-
myadmin_log(self::$module, 'info', 'Trying Username '.$options['username'], __LINE__, __FILE__);
158+
myadmin_log(self::$module, 'info', 'Trying Username '.$options['username'], __LINE__, __FILE__, self::$module, $serviceClass->getId());
159159
$response = $whm->xmlapi_query('createacct', $options);
160160
request_log(self::$module, $serviceClass->getCustid(), __FUNCTION__, 'cpanel', 'createacct', $options, $response);
161-
myadmin_log(self::$module, 'info', 'Response: '.str_replace('\n', "\n", $response), __LINE__, __FILE__);
161+
myadmin_log(self::$module, 'info', 'Response: '.str_replace('\n', "\n", $response), __LINE__, __FILE__, self::$module, $serviceClass->getId());
162162
$response = json_decode($response, true);
163163
}
164164
}
@@ -167,10 +167,10 @@ function_requirements('whm_api');
167167
$username .= 'a';
168168
$username = mb_substr($username, 1);
169169
$options['username'] = $username;
170-
myadmin_log(self::$module, 'info', 'Trying Username '.$options['username'], __LINE__, __FILE__);
170+
myadmin_log(self::$module, 'info', 'Trying Username '.$options['username'], __LINE__, __FILE__, self::$module, $serviceClass->getId());
171171
$response = $whm->xmlapi_query('createacct', $options);
172172
request_log(self::$module, $serviceClass->getCustid(), __FUNCTION__, 'cpanel', 'createacct', $options, $response);
173-
myadmin_log(self::$module, 'info', 'Response: '.str_replace('\n', "\n", $response), __LINE__, __FILE__);
173+
myadmin_log(self::$module, 'info', 'Response: '.str_replace('\n', "\n", $response), __LINE__, __FILE__, self::$module, $serviceClass->getId());
174174
$response = json_decode($response, true);
175175
}
176176
}
@@ -180,17 +180,17 @@ function_requirements('whm_api');
180180
if (isset($options['bwlimit']) && $options['bwlimit'] != 'unlimited') {
181181
$response3 = $whm->limitbw($username, $options['bwlimit']);
182182
request_log(self::$module, $serviceClass->getCustid(), __FUNCTION__, 'cpanel', 'limitbw', ['username' => $username, 'options' => $options['bwlimit']], $response3);
183-
myadmin_log(self::$module, 'info', 'Response: '.str_replace('\n', "\n", strip_tags($response3)), __LINE__, __FILE__);
183+
myadmin_log(self::$module, 'info', 'Response: '.str_replace('\n', "\n", strip_tags($response3)), __LINE__, __FILE__, self::$module, $serviceClass->getId());
184184
}
185185
if ($reseller === true) {
186186
$response2 = $whm->setupreseller($username, false);
187187
request_log(self::$module, $serviceClass->getCustid(), __FUNCTION__, 'cpanel', 'setupreseller', ['username' => $username], $response2);
188-
myadmin_log(self::$module, 'info', "Response: {$response2}", __LINE__, __FILE__);
188+
myadmin_log(self::$module, 'info', "Response: {$response2}", __LINE__, __FILE__, self::$module, $serviceClass->getId());
189189
$response3 = $whm->listacls();
190190

191191
$acls = json_decode($response3, true);
192192
request_log(self::$module, $serviceClass->getCustid(), __FUNCTION__, 'cpanel', 'listacls', [], $response);
193-
//myadmin_log(self::$module, 'info', json_encode($acls), __LINE__, __FILE__);
193+
//myadmin_log(self::$module, 'info', json_encode($acls), __LINE__, __FILE__, self::$module, $serviceClass->getId());
194194
if (!isset($acls['acls']['reseller'])) {
195195
$acl = [
196196
'acl-add-pkg' => 1, // Allow the creation of packages.
@@ -236,17 +236,17 @@ function_requirements('whm_api');
236236
'acllist' => 'reseller'
237237
];
238238
$response = $whm->saveacllist($acl);
239-
myadmin_log(self::$module, 'info', str_replace('\n', "\n", json_encode($response)), __LINE__, __FILE__);
239+
myadmin_log(self::$module, 'info', str_replace('\n', "\n", json_encode($response)), __LINE__, __FILE__, self::$module, $serviceClass->getId());
240240
request_log(self::$module, $serviceClass->getCustid(), __FUNCTION__, 'cpanel', 'saveacllist', $acl, $response);
241-
myadmin_log(self::$module, 'info', 'Reseller ACL Created', __LINE__, __FILE__);
241+
myadmin_log(self::$module, 'info', 'Reseller ACL Created', __LINE__, __FILE__, self::$module, $serviceClass->getId());
242242
} else {
243-
myadmin_log(self::$module, 'info', 'Reseller ACL Exists', __LINE__, __FILE__);
243+
myadmin_log(self::$module, 'info', 'Reseller ACL Exists', __LINE__, __FILE__, self::$module, $serviceClass->getId());
244244
}
245245
$request = ['reseller' => $username, 'acllist' => 'reseller'];
246246
$response = $whm->setacls($request);
247-
myadmin_log(self::$module, 'info', str_replace('\n', "\n", json_encode($response)), __LINE__, __FILE__);
247+
myadmin_log(self::$module, 'info', str_replace('\n', "\n", json_encode($response)), __LINE__, __FILE__, self::$module, $serviceClass->getId());
248248
request_log(self::$module, $serviceClass->getCustid(), __FUNCTION__, 'cpanel', 'setacls', $request, $response);
249-
myadmin_log(self::$module, 'info', 'Reseller assigned to ACL', __LINE__, __FILE__);
249+
myadmin_log(self::$module, 'info', 'Reseller assigned to ACL', __LINE__, __FILE__, self::$module, $serviceClass->getId());
250250
}
251251
$db = get_module_db(self::$module);
252252
$username = $db->real_escape($username);
@@ -276,20 +276,20 @@ function_requirements('whm_api');
276276
$data['store_owner'] = $userdata['account_lid'];
277277
$data['store_address'] = (isset($userdata['address']) ? $userdata['address'] : '');
278278
$data['site_desc'] = $soft->scripts[$script]['fullname'];
279-
myadmin_log(self::$module, 'info', 'Installing '.$soft->scripts[$script]['fullname'], __LINE__, __FILE__);
279+
myadmin_log(self::$module, 'info', 'Installing '.$soft->scripts[$script]['fullname'], __LINE__, __FILE__, self::$module, $serviceClass->getId());
280280
//$response = myadmin_unstringify($soft->install($script, $data));
281281
$response = json_decode($soft->install($script, $data), true);
282282
request_log(self::$module, $serviceClass->getCustid(), __FUNCTION__, 'softaculous', 'install', ['script' => $script, 'data' => $data], $response);
283-
myadmin_log(self::$module, 'info', str_replace('\n', "\n", json_encode($response)), __LINE__, __FILE__);
283+
myadmin_log(self::$module, 'info', str_replace('\n', "\n", json_encode($response)), __LINE__, __FILE__, self::$module, $serviceClass->getId());
284284
}
285285
function_requirements('add_dns_record');
286286
$response = add_dns_record(14426, 'wh'.$serviceClass->getId(), $ip, 'A', 86400, 0, true);
287-
myadmin_log(self::$module, 'info', 'Response: '.str_replace('\n', "\n", json_encode($response)), __LINE__, __FILE__);
287+
myadmin_log(self::$module, 'info', 'Response: '.str_replace('\n', "\n", json_encode($response)), __LINE__, __FILE__, self::$module, $serviceClass->getId());
288288
$response = $whm->park($options['username'], 'wh'.$serviceClass->getId().'.ispot.cc', '');
289-
myadmin_log(self::$module, 'info', 'Response: '.str_replace('\n', "\n", json_encode($response)), __LINE__, __FILE__);
289+
myadmin_log(self::$module, 'info', 'Response: '.str_replace('\n', "\n", json_encode($response)), __LINE__, __FILE__, self::$module, $serviceClass->getId());
290290
$event['success'] = true;
291291
} else {
292-
myadmin_log(self::$module, 'warning', 'Returning With Setup Failed from Response: '.str_replace('\n', "\n", json_encode($response)), __LINE__, __FILE__);
292+
myadmin_log(self::$module, 'warning', 'Returning With Setup Failed from Response: '.str_replace('\n', "\n", json_encode($response)), __LINE__, __FILE__, self::$module, $serviceClass->getId());
293293
$event['success'] = false;
294294
}
295295
$event->stopPropagation();
@@ -324,7 +324,7 @@ function_requirements('whm_api');
324324
} else {
325325
$response = json_decode($whm->unsuspendacct($serviceClass->getUsername()), true);
326326
}
327-
myadmin_log(self::$module, 'info', str_replace('\n', "\n", json_encode($response)), __LINE__, __FILE__);
327+
myadmin_log(self::$module, 'info', str_replace('\n', "\n", json_encode($response)), __LINE__, __FILE__, self::$module, $serviceClass->getId());
328328
$event->stopPropagation();
329329
}
330330
}
@@ -361,10 +361,10 @@ function_requirements('whm_api');
361361
$response = json_decode($whm->suspendacct($serviceClass->getUsername(), 'Canceled Service'), true);
362362
}
363363
} catch (\Exception $e) {
364-
myadmin_log('cpanel', 'error', 'suspendacct('.$serviceClass->getUsername().') tossed exception '.$e->getMessage(), __LINE__, __FILE__);
364+
myadmin_log('cpanel', 'error', 'suspendacct('.$serviceClass->getUsername().') tossed exception '.$e->getMessage(), __LINE__, __FILE__, self::$module, $serviceClass->getId());
365365
add_output('Caught exception: '.$e->getMessage().'<br>');
366366
}
367-
myadmin_log(self::$module, 'info', str_replace('\n', "\n", json_encode($response)), __LINE__, __FILE__);
367+
myadmin_log(self::$module, 'info', str_replace('\n', "\n", json_encode($response)), __LINE__, __FILE__, self::$module, $serviceClass->getId());
368368
}
369369
$event->stopPropagation();
370370
}
@@ -401,19 +401,19 @@ function_requirements('whm_api');
401401
} else {
402402
$response = json_decode($whm->removeacct($serviceClass->getUsername(), false), true);
403403
}
404-
myadmin_log(self::$module, 'info', str_replace('\n', "\n", json_encode($response)), __LINE__, __FILE__);
404+
myadmin_log(self::$module, 'info', str_replace('\n', "\n", json_encode($response)), __LINE__, __FILE__, self::$module, $serviceClass->getId());
405405
} else {
406-
myadmin_log(self::$module, 'info', "Skipping WHMAPI/Server Removal for {$serviceClass->getHostname()} because username is blank", __LINE__, __FILE__);
406+
myadmin_log(self::$module, 'info', "Skipping WHMAPI/Server Removal for {$serviceClass->getHostname()} because username is blank", __LINE__, __FILE__, self::$module, $serviceClass->getId());
407407
}
408408
$dnsr = json_decode($whm->dumpzone($serviceClass->getHostname()), true);
409409
if ($dnsr['result'][0]['status'] == 1) {
410410
$db = get_module_db(self::$module);
411411
$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__);
412412
if ($db->num_rows() == 0) {
413-
myadmin_log(self::$module, 'info', "Removing Hanging DNS entry for {$serviceClass->getHostname()}", __LINE__, __FILE__);
413+
myadmin_log(self::$module, 'info', "Removing Hanging DNS entry for {$serviceClass->getHostname()}", __LINE__, __FILE__, self::$module, $serviceClass->getId());
414414
$whm->killdns($serviceClass->getHostname());
415415
} else {
416-
myadmin_log(self::$module, 'info', "Skipping Removing DNS entry for {$serviceClass->getHostname()} because other non deleted sites w/ the same hostname exist", __LINE__, __FILE__);
416+
myadmin_log(self::$module, 'info', "Skipping Removing DNS entry for {$serviceClass->getHostname()} because other non deleted sites w/ the same hostname exist", __LINE__, __FILE__, self::$module, $serviceClass->getId());
417417
}
418418
}
419419
$event->stopPropagation();
@@ -438,7 +438,7 @@ public static function getChangeIp(GenericEvent $event)
438438
$serviceClass = $event->getSubject();
439439
$settings = get_module_settings(self::$module);
440440
$cpanel = new Cpanel(FANTASTICO_USERNAME, FANTASTICO_PASSWORD);
441-
myadmin_log(self::$module, 'info', 'IP Change - (OLD:'.$serviceClass->getIp().") (NEW:{$event['newip']})", __LINE__, __FILE__);
441+
myadmin_log(self::$module, 'info', 'IP Change - (OLD:'.$serviceClass->getIp().") (NEW:{$event['newip']})", __LINE__, __FILE__, self::$module, $serviceClass->getId());
442442
$response = $cpanel->editIp($serviceClass->getIp(), $event['newip']);
443443
if (isset($response['faultcode'])) {
444444
myadmin_log(self::$module, 'error', 'Cpanel editIp('.$serviceClass->getIp().', '.$event['newip'].') returned Fault '.$response['faultcode'].': '.$response['fault'], __LINE__, __FILE__, self::$module);

0 commit comments

Comments
 (0)