Merge pull request #15 from kumar-interserver/master

Pull req from Base repo and Minor fix in 1.99 domain website check
myadmin-plugins · Sep 19, 2019 · b45021a · b45021a
2 parents 8c95d33 + 7f5d104
commit b45021a
Showing 1 changed file with 20 additions and 3 deletions.
diff --git a/src/Plugin.php b/src/Plugin.php
@@ -228,8 +228,12 @@ function_requirements('class.OpenSRS');
 						myadmin_log('opensrs', 'info', "Customer trying to register domain for $1.99 without webhosting order", __LINE__, __FILE__, self::$module, $serviceClass->getId());
 						return false;
 					}
-					$db->next_record();
-					if ($db->Record['website_status'] != 'active') {
+					$website_active = false;
+					while ($db->next_record(MYSQL_ASSOC)) {
+						if ($db->Record['website_status'] == 'active')
+							$website_active = true;
+					}
+					if ($website_active == false) {
 						dialog('Failed', 'Kindly make payment of website '.$db->Record['website_id'].' you ordered along with this domain.');
 						myadmin_log('opensrs', 'info', "Customer trying to register domain without paying webhosting order {$db->Record['website_id']}", __LINE__, __FILE__, self::$module, $serviceClass->getId());
 						return false;
@@ -381,7 +385,7 @@ function_requirements('class.OpenSRS');
 				if (trim($serviceClass->getFax()) != '') {
 					$callArray['fax'] = $serviceClass->getFax();
 				}
-				if (in_array($serviceTld, ['.abogado', '.aero', '.asia', '.cl', '.co.hu', '.com.ar', '.com.br', '.com.lv', '.com.mx', '.com.pt', '.com.ro', '.coop', '.co.za', '.de', '.dk', '.es', '.fr', '.hk', '.hu', '.it', '.jobs', '.law', '.lv', '.mx', '.my', '.no', '.nu', '.nyc', '.pm', '.pro', '.pt', '.re', '.ro', '.ru', '.se', '.sg', '.tf', '.travel', '.uk', '.us', '.wf', '.xxx', '.yt'])) {
+				if (in_array($serviceTld, ['.abogado', '.aero', '.asia', '.cl', '.co.hu', '.com.au', '.com.ar', '.com.br', '.com.lv', '.com.mx', '.com.pt', '.com.ro', '.coop', '.co.za', '.de', '.dk', '.es', '.fr', '.hk', '.hu', '.it', '.jobs', '.law', '.lv', '.mx', '.my', '.no', '.nu', '.nyc', '.pm', '.pro', '.pt', '.re', '.ro', '.ru', '.se', '.sg', '.tf', '.travel', '.uk', '.us', '.wf', '.xxx', '.yt'])) {
 					$callArray['data']['tld_data'] = [];
 					if (in_array($serviceTld, ['.abogado', '.aero', '.cl', '.co.hu', '.com.ar', '.com.lv', '.com.mx', '.com.pt', '.com.ro', '.coop', '.co.za', '.de', '.dk', '.es', '.fi.', '.fr', '.hk', '.hu', '.jobs', '.law', '.lv', '.mx', '.my', '.no', '.nu', '.nyc', '.pm', '.pt', '.re', '.ro', '.ru', '.se', '.sg', '.tf', '.travel', '.wf', '.yt'])) {
 						$callArray['data']['tld_data']['registrant_extra_info'] = [];
@@ -442,6 +446,19 @@ function_requirements('class.OpenSRS');
 							$callArray['data']['tld_data']['registrant_extra_info'] = $extraInfo;
 						}
 					} else {
+						if ($serviceTld == '.com.au') {
+							$au_registrant_info = [
+								'policy_reason' => $extra['policy_reason'],
+								'registrant_id_type' => $extra['registrant_id_type'],
+								'registrant_id' => $extra['registrant_id'],
+								'registrant_name' => $extra['registrant_name'],
+								'eligibility_id_type' => $extra['eligibility_id_type'],
+								'eligibility_id' => $extra['eligibility_id'],
+								'eligibility_name' => $extra['eligibility_name'],
+								'eligibility_type' => $extra['eligibility_type']
+							];
+							$callArray['data']['tld_data']['au_registrant_info'] = $au_registrant_info;
+						}
 						// .asia Domains
 						if ($serviceTld == '.asia') {
 							$callArray['data']['tld_data']['cedinfo'] = [