refactoring improvements

Author: detain

bin/parallels.php

@@ -6,10 +6,10 @@
 //$GLOBALS['tf']->session->verify();
 
 $Key = 'PLSK.03117920.0000';
-$ip = '206.72.205.242';
+$ipAddress = '206.72.205.242';
 $ka = new \Detain\Parallels\Parallels();
 print_r($ka->getKeyInfo($Key));
-//print_r($ka->getKeyNumbers(array($ip)));
+//print_r($ka->getKeyNumbers(array($ipAddress)));
 //print_r($ka->getAvailableKeyTypesAndFeatures());
 //print_r($ka->getAvailableUpgrades($Key));
 //print_r($ka->retrieveKey($Key));

bin/parallels_getAvailableUpgrades.php

@@ -6,7 +6,7 @@
 //$GLOBALS['tf']->session->verify();
 
 $Key = 'PLSK.03117920.0000';
-$ip = '206.72.205.242';
+$ipAddress = '206.72.205.242';
 $ka = new \Detain\Parallels\Parallels();
 print_r($ka->getAvailableUpgrades($Key));
 

bin/parallels_getKeyInfo.php

@@ -6,7 +6,7 @@
 //$GLOBALS['tf']->session->verify();
 
 $Key = 'PLSK.03117920.0000';
-$ip = '206.72.205.242';
+$ipAddress = '206.72.205.242';
 $ka = new \Detain\Parallels\Parallels();
 print_r($ka->getKeyInfo($Key));
 

bin/parallels_getKeyNumbers.php

@@ -6,8 +6,8 @@
 //$GLOBALS['tf']->session->verify();
 
 $Key = 'PLSK.03117920.0000';
-$ip = '206.72.205.242';
+$ipAddress = '206.72.205.242';
 $ka = new \Detain\Parallels\Parallels();
-print_r($ka->getKeyNumbers(array($ip)));
+print_r($ka->getKeyNumbers(array($ipAddress)));
 
 //$GLOBALS['tf']->session->destroy();

bin/parallels_retrieveKey.php

@@ -6,7 +6,7 @@
 //$GLOBALS['tf']->session->verify();
 
 $Key = 'PLSK.03117920.0000';
-$ip = '206.72.205.242';
+$ipAddress = '206.72.205.242';
 $ka = new \Detain\Parallels\Parallels();
 print_r($ka->retrieveKey($Key));
 

src/parallels.inc.php

@@ -18,14 +18,14 @@
 
 /**
  * activate_parallels()
- * @param mixed  $ip
+ * @param mixed  $ipAddress
  * @param mixed  $type
  * @param string $addons
  * @return mixed
  */
-function activate_parallels($ip, $type, $addons = '') {
+function activate_parallels($ipAddress, $type, $addons = '') {
 	function_requirements('class.Parallels');
-	myadmin_log('licenses', 'info', "Parallels New License $ip Type $type Addons $addons called", __LINE__, __FILE__);
+	myadmin_log('licenses', 'info', "Parallels New License $ipAddress Type $type Addons $addons called", __LINE__, __FILE__);
 	ini_set('max_execution_time', 1000); // just put a lot of time
 	ini_set('default_socket_timeout', 1000); // same
 	$db = get_module_db('licenses');
@@ -40,10 +40,10 @@ function_requirements('class.Parallels');
 	// check if already active
 	myadmin_log('licenses', 'info', 'a_addons:', __LINE__, __FILE__);
 	myadmin_log('licenses', 'info', var_export($a_addons, true), __LINE__, __FILE__);
-	$request = array($type, $a_addons, $ip);
-	$response = $parallels->createKey($type, $a_addons, $ip);
+	$request = array($type, $a_addons, $ipAddress);
+	$response = $parallels->createKey($type, $a_addons, $ipAddress);
 	request_log('licenses', false, __FUNCTION__, 'parallels', 'createKey', $request, $response);
-	myadmin_log('licenses', 'info', "activate Parallels({$ip}, {$type}, {$addons}) Response: ".json_encode($response), __LINE__, __FILE__);
+	myadmin_log('licenses', 'info', "activate Parallels({$ipAddress}, {$type}, {$addons}) Response: ".json_encode($response), __LINE__, __FILE__);
 	/* example response:
 	Array(
 	[mainKeyNumber] => PLSK.00007677.0000
@@ -74,15 +74,15 @@ function_requirements('class.Parallels');
 }
 
 /**
-* @param $ip
+* @param $ipAddress
 */
-function deactivate_parallels($ip) {
-	myadmin_log('licenses', 'info', "Parallels Deactivation ({$ip})", __LINE__, __FILE__);
+function deactivate_parallels($ipAddress) {
+	myadmin_log('licenses', 'info', "Parallels Deactivation ({$ipAddress})", __LINE__, __FILE__);
 	function_requirements('class.Parallels');
 	$parallels = new \Detain\Parallels\Parallels();
-	$key = $parallels->getMainKeyFromIp($ip);
-	request_log('licenses', false, __FUNCTION__, 'parallels', 'getMainKeyFromIp', $ip, $key);
-	myadmin_log('licenses', 'info', "Parallels getMainKeyFromIp({$ip}) = {$key} Raw Response: ".json_encode($parallels->response), __LINE__, __FILE__);
+	$key = $parallels->getMainKeyFromIp($ipAddress);
+	request_log('licenses', false, __FUNCTION__, 'parallels', 'getMainKeyFromIp', $ipAddress, $key);
+	myadmin_log('licenses', 'info', "Parallels getMainKeyFromIp({$ipAddress}) = {$key} Raw Response: ".json_encode($parallels->response), __LINE__, __FILE__);
 	if ($key !== false) {
 		$response = $parallels->terminateKey($key);
 		request_log('licenses', false, __FUNCTION__, 'parallels', 'terminateKey', $key, $response);