Fixed #55

Author: Rafael Grigorian

src/app/code/JetRails/Cloudflare/Console/Command/AbstractCommand.php

@@ -30,7 +30,8 @@ protected function _getDomainNames () {
 			$stores = $this->_storeManager->getStores ();
 			foreach ( $stores as $store ) {
 				$domain = parse_url ( $store->getBaseUrl () ) ["host"];
-				array_push ( $domains, $domain );
+				preg_match ( "/([^.\s]+\.([^.\s]{3,}|[^.\s]{2}\.[^.\s]{2}|[^.\s]{2}))\b$/im", $domain, $matches );
+				array_push ( $domains, $matches [ 1 ] );
 			}
 			$domains = array_unique ( $domains );
 			sort ( $domains );
@@ -47,7 +48,8 @@ protected function _getStoreByDomain ( $domain ) {
 			$stores = $this->_storeManager->getStores ();
 			foreach ( $stores as $store ) {
 				$host = parse_url ( $store->getBaseUrl () ) ["host"];
-				if ( $host === $domain ) {
+				preg_match ( "/([^.\s]+\.([^.\s]{3,}|[^.\s]{2}\.[^.\s]{2}|[^.\s]{2}))\b$/im", $host, $matches );
+				if ( $matches [ 1 ] === $domain ) {
 					return $store;
 				}
 			}

src/app/code/JetRails/Cloudflare/Helper/Adminhtml/Data.php

@@ -161,7 +161,7 @@ public function getDomainName () {
 			}
 			$domain = $this->_storeManager->getStore ()->getBaseUrl ();
 			$domain = parse_url ( $domain ) ["host"];
-			preg_match ( "/\.?([^.]+\.[^.]+)$/i", $domain, $matches );
+			preg_match ( "/([^.\s]+\.([^.\s]{3,}|[^.\s]{2}\.[^.\s]{2}|[^.\s]{2}))\b$/im", $domain, $matches );
 			return $matches [ 1 ];
 		}
 
@@ -179,7 +179,7 @@ public function getDomainNames () {
 			$stores = $this->_storeManager->getStores ();
 			foreach ( $stores as $store ) {
 				$domain = parse_url ( $store->getBaseUrl () ) ["host"];
-				preg_match ( "/\.?([^.]+\.[^.]+)$/im", $domain, $matches );
+				preg_match ( "/([^.\s]+\.([^.\s]{3,}|[^.\s]{2}\.[^.\s]{2}|[^.\s]{2}))\b$/im", $domain, $matches );
 				$domain = $matches [ 1 ];
 				array_push ( $domains, $domain );
 			}