Skip to content

Commit f4a08a9

Browse files
detaindetain
committed
a bunch more updates to the various addons myadmin_log calls adding the nmew optional parameters
1 parent 58b98a8 commit f4a08a9

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

‎src/Plugin.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,20 @@ function_requirements('whm_api');
9696
}
9797
// check if ip is main or additional/dedicated. if ip is main, get a new one
9898
if (in_array($serviceInfo[$settings['PREFIX'].'_ip'], $sharedIps)) {
99-
myadmin_log(self::$module, 'info', "ip {$serviceInfo[$settings['PREFIX'].'_ip']} (Shared) Main IP {$mainIp}", __LINE__, __FILE__);
99+
myadmin_log(self::$module, 'info', "ip {$serviceInfo[$settings['PREFIX'].'_ip']} (Shared) Main IP {$mainIp}", __LINE__, __FILE__, self::$module, $serviceInfo[$settings['PREFIX'].'_id']);
100100
if (count($freeips) > 0) {
101101
// assign new ip
102102
$serviceInfo[$settings['PREFIX'].'_ip'] = $freeips[0];
103103
$response = $whm->setsiteip($serviceInfo[$settings['PREFIX'].'_ip'], $serviceInfo[$settings['PREFIX'].'_username']);
104-
myadmin_log(self::$module, 'info', "WHM setsiteip({$serviceInfo[$settings['PREFIX'].'_ip']}, {$serviceInfo[$settings['PREFIX'].'_username']}) Response: {$response}", __LINE__, __FILE__);
104+
myadmin_log(self::$module, 'info', "WHM setsiteip({$serviceInfo[$settings['PREFIX'].'_ip']}, {$serviceInfo[$settings['PREFIX'].'_username']}) Response: {$response}", __LINE__, __FILE__, self::$module, $serviceInfo[$settings['PREFIX'].'_id']);
105105
$response = json_decode($response);
106106
if ($response->result[0]->status == 1) {
107107
// update db w/ new ip
108108
$db = get_module_db(self::$module);
109109
$db->query("update {$settings['TABLE']} set {$settings['PREFIX']}_ip='{$serviceInfo[$settings['PREFIX'].'_ip']}' where {$settings['PREFIX']}_id={$serviceInfo[$settings['PREFIX'].'_id']}", __LINE__, __FILE__);
110-
myadmin_log(self::$module, 'info', "Gave Website {$serviceInfo[$settings['PREFIX'].'_id']} IP {$serviceInfo[$settings['PREFIX'].'_ip']}", __LINE__, __FILE__);
110+
myadmin_log(self::$module, 'info', "Gave Website {$serviceInfo[$settings['PREFIX'].'_id']} IP {$serviceInfo[$settings['PREFIX'].'_ip']}", __LINE__, __FILE__, self::$module, $serviceInfo[$settings['PREFIX'].'_id']);
111111
} else {
112-
myadmin_log(self::$module, 'info', "Error Giving Website {$serviceInfo[$settings['PREFIX'].'_id']} IP {$serviceInfo[$settings['PREFIX'].'_ip']}", __LINE__, __FILE__);
112+
myadmin_log(self::$module, 'info', "Error Giving Website {$serviceInfo[$settings['PREFIX'].'_id']} IP {$serviceInfo[$settings['PREFIX'].'_ip']}", __LINE__, __FILE__, self::$module, $serviceInfo[$settings['PREFIX'].'_id']);
113113
$headers = '';
114114
$headers .= 'MIME-Version: 1.0'.PHP_EOL;
115115
$headers .= 'Content-type: text/html; charset=UTF-8'.PHP_EOL;
@@ -120,14 +120,14 @@ function_requirements('whm_api');
120120
} else {
121121
$subject = "0 Free IPs On {$settings['TBLNAME']} Server {$serverdata[$settings['PREFIX'].'_name']}";
122122
admin_mail($subject, "webserver {$serviceInfo[$settings['PREFIX'].'_id']} Has Pending IPS<br>\n".$subject, false, false, 'admin/website_no_ips.tpl');
123-
myadmin_log(self::$module, 'info', $subject, __LINE__, __FILE__);
123+
myadmin_log(self::$module, 'info', $subject, __LINE__, __FILE__, self::$module, $serviceInfo[$settings['PREFIX'].'_id']);
124124
}
125125
} else {
126-
myadmin_log(self::$module, 'info', "ip {$serviceInfo[$settings['PREFIX'].'_ip']} (Already Dedicated) Main IP {$mainIp}", __LINE__, __FILE__);
126+
myadmin_log(self::$module, 'info', "ip {$serviceInfo[$settings['PREFIX'].'_ip']} (Already Dedicated) Main IP {$mainIp}", __LINE__, __FILE__, self::$module, $serviceInfo[$settings['PREFIX'].'_id']);
127127
}
128128
} else {
129129
$serviceInfo[$settings['PREFIX'].'_ip'] = $regexMatch;
130-
myadmin_log(self::$module, 'info', "ip {$serviceInfo[$settings['PREFIX'].'_ip']} (Already Dedicated)", __LINE__, __FILE__);
130+
myadmin_log(self::$module, 'info', "ip {$serviceInfo[$settings['PREFIX'].'_ip']} (Already Dedicated)", __LINE__, __FILE__, self::$module, $serviceInfo[$settings['PREFIX'].'_id']);
131131
}
132132
}
133133

@@ -171,17 +171,17 @@ function_requirements('whm_api');
171171
}
172172
// check if ip is main or additional/dedicated. if ip is main, get a new one
173173
if (!in_array($serviceInfo[$settings['PREFIX'].'_ip'], $sharedIps)) {
174-
myadmin_log(self::$module, 'info', "ip {$serviceInfo[$settings['PREFIX'].'_ip']} (Dedicated IP) Main IP {$mainIp}", __LINE__, __FILE__);
174+
myadmin_log(self::$module, 'info', "ip {$serviceInfo[$settings['PREFIX'].'_ip']} (Dedicated IP) Main IP {$mainIp}", __LINE__, __FILE__, self::$module, $serviceInfo[$settings['PREFIX'].'_id']);
175175
$newIp = $sharedIps[0];
176176
$response = $whm->setsiteip($newIp, $serviceInfo[$settings['PREFIX'].'_username']);
177-
myadmin_log(self::$module, 'info', "WHM setsiteip({$newIp}, {$serviceInfo[$settings['PREFIX'].'_username']}) Response: {$response}", __LINE__, __FILE__);
177+
myadmin_log(self::$module, 'info', "WHM setsiteip({$newIp}, {$serviceInfo[$settings['PREFIX'].'_username']}) Response: {$response}", __LINE__, __FILE__, self::$module, $serviceInfo[$settings['PREFIX'].'_id']);
178178
$response = json_decode($response);
179179
if ($response->result[0]->status == 1) {
180180
// update db w/ new ip
181181
$db->query("update {$settings['TABLE']} set {$settings['PREFIX']}_ip='{$mainIp}' where {$settings['PREFIX']}_id={$serviceInfo[$settings['PREFIX'].'_id']}", __LINE__, __FILE__);
182-
myadmin_log(self::$module, 'info', "Gave Website {$serviceInfo[$settings['PREFIX'].'_id']} Main IP {$serviceInfo[$settings['PREFIX'].'_ip']}", __LINE__, __FILE__);
182+
myadmin_log(self::$module, 'info', "Gave Website {$serviceInfo[$settings['PREFIX'].'_id']} Main IP {$serviceInfo[$settings['PREFIX'].'_ip']}", __LINE__, __FILE__, self::$module, $serviceInfo[$settings['PREFIX'].'_id']);
183183
} else {
184-
myadmin_log(self::$module, 'info', "Error Giving Website {$serviceInfo[$settings['PREFIX'].'_id']} Main IP {$serviceInfo[$settings['PREFIX'].'_ip']}", __LINE__, __FILE__);
184+
myadmin_log(self::$module, 'info', "Error Giving Website {$serviceInfo[$settings['PREFIX'].'_id']} Main IP {$serviceInfo[$settings['PREFIX'].'_ip']}", __LINE__, __FILE__, self::$module, $serviceInfo[$settings['PREFIX'].'_id']);
185185
$headers = '';
186186
$headers .= 'MIME-Version: 1.0'.PHP_EOL;
187187
$headers .= 'Content-type: text/html; charset=UTF-8'.PHP_EOL;
@@ -190,7 +190,7 @@ function_requirements('whm_api');
190190
admin_mail($subject, $subject, $headers, false, 'admin/website_no_ips.tpl');
191191
}
192192
} else {
193-
myadmin_log(self::$module, 'info', "ip {$serviceInfo[$settings['PREFIX'].'_ip']} (Shared IP) Main IP {$mainIp}, no Change Needed", __LINE__, __FILE__, self::$module);
193+
myadmin_log(self::$module, 'info', "ip {$serviceInfo[$settings['PREFIX'].'_ip']} (Shared IP) Main IP {$mainIp}, no Change Needed", __LINE__, __FILE__, self::$module, $serviceInfo[$settings['PREFIX'].'_id']);
194194
}
195195
add_output('Dedicated IP Order Canceled');
196196
$email = $settings['TBLNAME'].' ID: '.$serviceInfo[$settings['PREFIX'].'_id'].'<br>'.$settings['TBLNAME'].' Hostname: '.$serviceInfo[$settings['PREFIX'].'_hostname'].'<br>Description: '.self::$name.'<br>';

0 commit comments

Comments
 (0)