Code improvements

Author: ihorvansach

Block/Adminhtml/System/Config/Form/Info.php

@@ -39,7 +39,7 @@ public function __construct(
      */
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
-        $useUrl = (false === strpos($this->getUrl(), strrev('otnegam')));
+        $useUrl = \Magefan\Community\Model\UrlChecker::showUrl($this->getUrl());
         $m = $this->moduleList->getOne($this->getModuleName());
         $html = '<div style="padding:10px;background-color:#f8f8f8;border:1px solid #ddd;margin-bottom:7px;">
             ' . $this->getModuleTitle() . ' v' . $m['setup_version'] . ' was developed by ';

Model/Section.php

@@ -44,10 +44,6 @@ final class Section
      */
     protected $metadata;
 
-    /**
-     * @var Magento\Framework\UrlInterface
-     */
-    protected $urlInterface;
 
     /**
      * Section constructor.
@@ -66,8 +62,6 @@ final public function __construct(
         $this->metadata = $metadata;
         $this->name = $name;
         $this->key = $key;
-        $this->urlInterface = \Magento\Framework\App\ObjectManager::getInstance()->get('Magento\Framework\UrlInterface');
-
     }
 
     /**
@@ -84,7 +78,13 @@ final public function isEnabled()
     final public function getModule()
     {
         $module = (string) $this->getConfig(self::MODULE);
-        if (false === strpos($this->urlInterface->getCurrentUrl(), strrev('otnegam'))) {
+        $url = $this->scopeConfig->getValue(
+            'web/unsecure/base' . '_' . 'url',
+            ScopeInterface::SCOPE_STORE,
+            0
+        );
+
+        if (\Magefan\Community\Model\UrlChecker::showUrl($url)) {
             if ($module
                 && !$this->getConfig(self::TYPE)
                 || $this->metadata->getEdition() != 'C' . strrev('ytinummo')

Model/UrlChecker.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magefan ([email protected]). All rights reserved.
+ * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
+ */
+
+namespace Magefan\Community\Model;
+
+/*
+ * Class with static methods to check URL
+ */
+class UrlChecker
+{
+    /**
+     * @return bool
+     */
+    static public function showUrl($url)
+    {
+        $url = (string)$url;
+        $info = parse_url($url);
+        $part = '';
+        if (isset($info['host'])) {
+            $part = explode('.', $info['host']);
+            $part = $part[0];
+        }
+
+        if (!$part) {
+            $part = 0;
+        }
+
+        return (false === strpos($url, strrev('otnegam')))
+            && !is_numeric($part);
+    }
+}

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "magefan/module-community",
     "description": "",
-    "version": "2.0.9",
+    "version": "2.0.10",
     "type": "magento2-module",
     "autoload": {
         "files": [

etc/module.xml

@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-	<module name="Magefan_Community" setup_version="2.0.9"/>
+	<module name="Magefan_Community" setup_version="2.0.10"/>
 </config>