Merge pull request #84 from akunzai/remove-yireo-access

Remove yireo access
akunzai · May 19, 2024 · b9ba80d · b9ba80d
2 parents 323f2f7 + 420439c
commit b9ba80d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 102 deletions.
diff --git a/magento/app/code/community/Yireo/MageBridge/Block/Check.php b/magento/app/code/community/Yireo/MageBridge/Block/Check.php
@@ -269,26 +269,20 @@ protected function addSystemChecks()
         $result = ($this->hasOpcaching()) ? self::CHECK_OK : self::CHECK_WARNING;
         $this->addResult('system', 'OPC-caching', $result, 'An OPC-caching PHP-extension (like Zend OPC, APC or XCache) is highly recommended');
 
-        $remote_domain = 'api.yireo.com';
-        $result = (gethostbyname($remote_domain) == $remote_domain) ? self::CHECK_ERROR : self::CHECK_OK;
+        $api_url = Mage::getStoreConfig('magebridge/joomla/api_url');
+        $url_components = parse_url($api_url);
+        $host = $url_components['host'];
+        $port = (isset($url_components['port'])) ? $url_components['port'] : 80;
+        $result = (gethostbyname($host) == $host) ? self::CHECK_ERROR : self::CHECK_OK;
         $this->addResult('system', 'DNS', $result, 'External DNS lookups need to be enabled');
 
-        $result = ($this->hasOutgoingWebaccess()) ? self::CHECK_OK : self::CHECK_ERROR;
-        $this->addResult('system', 'Firewall', $result, 'Firewall needs to allow outgoing access on port 80.');
+        $result = (bool)@fsockopen($host, $port, $errno, $errmsg, 5) ? self::CHECK_OK : self::CHECK_ERROR;
+        $this->addResult('system', 'Firewall', $result, 'Firewall needs to allow outgoing access on port ' . $port . '.');
 
         $result = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? self::CHECK_ERROR : self::CHECK_OK;
         $this->addResult('system', 'Operating System', $result, 'Windows platforms are not supported.');
     }
 
-    /**
-     * @return bool
-     */
-    protected function hasOutgoingWebaccess()
-    {
-        $remote_domain = 'api.yireo.com';
-        return (bool)@fsockopen($remote_domain, 80, $errno, $errmsg, 5);
-    }
-
     /**
      * Check for a valid OP caching mechanism
      *

diff --git a/magento/app/code/community/Yireo/MageBridge/Model/Feed.php b/magento/app/code/community/Yireo/MageBridge/Model/Feed.php
diff --git a/magento/app/code/community/Yireo/MageBridge/Model/Observer.php b/magento/app/code/community/Yireo/MageBridge/Model/Observer.php
@@ -451,11 +451,7 @@ public function checkoutTypeOnepageSaveOrderAfter($observer)
      */
     public function controllerActionPredispatch($observer)
     {
-        // Run the feed
-        Mage::getModel('magebridge/feed')->updateIfAllowed();
-
         // Get the variables
-        $controller = $observer->getEvent()->getControllerAction();
         $currentUrl = Mage::helper('core/url')->getCurrentUrl();
 
         // Remote SSO login within native Magento frontend

diff --git a/magento/app/design/adminhtml/default/default/template/magebridge/check.phtml b/magento/app/design/adminhtml/default/default/template/magebridge/check.phtml
@@ -10,7 +10,7 @@
  */
 ?>
 
-<div class="columns ">
+<div class="columns">
 
 <div class="side-col" id="page:left">
 <?php echo $this->getMenu(); ?>
@@ -36,7 +36,7 @@
         <h4 class="icon-head head-edit-form fieldset-legend"><?php echo $this->__($title); ?></h4>
     </div>
 
-    <div class="fieldset ">
+    <div class="fieldset">
         <table cellspacing="5" class="form-list">
             <?php foreach($checks as $check) { ?>
             <tr>
@@ -54,16 +54,12 @@
     <div class="entry-edit-head">
         <h4 class="icon-head head-edit-form fieldset-legend"><?php echo $this->__('Other checks'); ?></h4>
     </div>
-    <div class="fieldset ">
+    <div class="fieldset">
         <p>
             <a href="<?php echo $this->getLogUrl('magebridge'); ?>"><?php echo $this->__('MageBridge Log'); ?></a><br/>
             <a href="<?php echo $this->getLogUrl('system'); ?>"><?php echo $this->__('System Log'); ?></a><br/>
             <a href="<?php echo $this->getLogUrl('exception'); ?>"><?php echo $this->__('Exception Log'); ?></a><br/>
         </p>
-        <p>
-            Looking for Magento tuning? We can help you out: 
-            <a target="_new" href="https://www.yireo.com/services/magento-services/magento-performance-insights">Magento Performance Insights</a>
-        </p>
     </div>
 </div>