fix import issues

Author: landofcoder

CHANGELOG.md

@@ -1,2 +1,6 @@
 # 1.0.10 - 08/17/2021
-- Release Lof_ElasticsuiteBlog: a Smile_ElasticSuite addon
+- Release Lof_ElasticsuiteBlog: a Smile_ElasticSuite addon
+
+# 1.0.12 - 01/25/2024
+- Compatible magento 2.4.x, PHP 8.1, PHP 8.2
+- Remove Addthis widget (social share settings)

Controller/Adminhtml/Importer/Edit.php

@@ -1,18 +1,18 @@
 <?php
 /**
  * Venustheme
- * 
+ *
  * NOTICE OF LICENSE
- * 
+ *
  * This source file is subject to the Venustheme.com license that is
  * available through the world-wide-web at this URL:
  * http://www.venustheme.com/license-agreement.html
- * 
+ *
  * DISCLAIMER
- * 
+ *
  * Do not edit or add to this file if you wish to upgrade this extension to newer
  * version in the future.
- * 
+ *
  * @category   Venustheme
  * @package    Ves_Blog
  * @copyright  Copyright (c) 2016 Venustheme (http://www.venustheme.com/)
@@ -36,6 +36,11 @@ class Edit extends \Magento\Backend\App\Action
      */
     protected $resultPageFactory;
 
+    /**
+     * @var \Ves\Blog\Model\ImporterFactory
+     */
+    protected $importerFactory;
+
     /**
      * @param Action\Context
      * @param \Magento\Framework\View\Result\PageFactory
@@ -44,9 +49,11 @@ class Edit extends \Magento\Backend\App\Action
     public function __construct(
         Action\Context $context,
         \Magento\Framework\View\Result\PageFactory $resultPageFactory,
-        \Magento\Framework\Registry $registry
+        \Magento\Framework\Registry $registry,
+        \Ves\Blog\Model\ImporterFactory $importerFactory
     ) {
         $this->resultPageFactory = $resultPageFactory;
+        $this->importerFactory = $importerFactory;
         $this->_coreRegistry = $registry;
         parent::__construct($context);
     }
@@ -85,7 +92,7 @@ public function execute()
     {
         // 1. Get ID and create model
         $id = $this->getRequest()->getParam('importer_id');
-        $model = $this->_objectManager->create('Ves\Blog\Model\Importer');
+        $model = $this->importerFactory->create();
 
         // 2. Initial checking
         if ($id) {

Model/Import/AbstractImport.php

@@ -1,18 +1,18 @@
 <?php
 /**
  * Venustheme
- * 
+ *
  * NOTICE OF LICENSE
- * 
+ *
  * This source file is subject to the Venustheme.com license that is
  * available through the world-wide-web at this URL:
  * http://www.venustheme.com/license-agreement.html
- * 
+ *
  * DISCLAIMER
- * 
+ *
  * Do not edit or add to this file if you wish to upgrade this extension to newer
  * version in the future.
- * 
+ *
  * @category   Venustheme
  * @package    Ves_Blog
  * @copyright  Copyright (c) 2016 Venustheme (http://www.venustheme.com/)
@@ -65,6 +65,8 @@ abstract class AbstractImport extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\App\ResourceConnection\ConnectionFactory $connectionFactory
      * @param \Magento\Framework\Filesystem\Io\File $file
      * @param \Magento\Framework\Filesystem\DirectoryList $dir
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null
+     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null
      * @param array $data
      */
     public function __construct(
@@ -78,13 +80,13 @@ public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
         \Magento\Backend\Model\Auth\Session $authSession,
         \Ves\Blog\Helper\Data $helper,
-        \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         \Magento\Framework\App\ResourceConnection\ConnectionFactory $connectionFactory,
         \Magento\Framework\Filesystem\Io\File $file,
         \Magento\Framework\Filesystem\DirectoryList $dir,
+        \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
+        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = []
-        ) {
+    ) {
         $this->_postFactory     = $postFactory;
         $this->_categoryFactory = $categoryFactory;
         $this->_commentFactory  = $commentFactory;
@@ -99,6 +101,9 @@ public function __construct(
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
     }
 
+    /**
+     * @inheritdoc
+     */
     protected function _connect()
     {
         $con = '';
@@ -109,7 +114,7 @@ protected function _connect()
             $dbhost = $this->getData('dbhost');
             $charset = $this->getData('connect_charset');
             $charset = $charset?$charset:'utf8mb4';
-            
+
             if($dbname=='' || $uname=='' || $pwd=='' || $dbhost==''){
                 throw new \Exception(__("Some fields are required"));
             }
@@ -118,7 +123,7 @@ protected function _connect()
                 'dbname' => $dbname,
                 'username' => $uname,
                 'password' => $pwd,
-                'active' => '1',    
+                'active' => '1',
             ));
             $con->query("SET character_set_results = '".$charset."', character_set_client = '".$charset."', character_set_connection = '".$charset."', character_set_database = '".$charset."', character_set_server = '".$charset."'");
         } catch (\Exception $e) {
@@ -138,7 +143,8 @@ protected function getImageImportFolder($path)
         return $images . '/';
     }
 
-    public function getConnection(){
+    public function getConnection()
+    {
         if(!$this->_connect){
             $this->_connect();
         }

Model/Import/Wordpress.php

@@ -1,18 +1,18 @@
 <?php
 /**
  * Venustheme
- * 
+ *
  * NOTICE OF LICENSE
- * 
+ *
  * This source file is subject to the Venustheme.com license that is
  * available through the world-wide-web at this URL:
  * http://www.venustheme.com/license-agreement.html
- * 
+ *
  * DISCLAIMER
- * 
+ *
  * Do not edit or add to this file if you wish to upgrade this extension to newer
  * version in the future.
- * 
+ *
  * @category   Venustheme
  * @package    Ves_Blog
  * @copyright  Copyright (c) 2016 Venustheme (http://www.venustheme.com/)
@@ -25,6 +25,9 @@ class Wordpress extends AbstractImport
 	protected $_oldCategories = [];
 	protected $_catCount = 0;
 
+    /**
+     * @inheritdoc
+     */
 	public function execute()
 	{
 		$importPosts      = $this->getData('import_posts');
@@ -65,7 +68,7 @@ public function execute()
 							$data[$i]['name']        = $cat['name'];
 							$data[$i]['parent_id']   = $cat['parent'];
 							$data[$i]['stores']      = [$this->_storeManager->getDefaultStoreView()->getStoreId()];
-							$i++;	
+							$i++;
 						}
 					}
 					if($data){
@@ -79,7 +82,7 @@ public function execute()
 									$_cat['category_id'] = $category->getId();
 									$_cat['image'] = $_cat['layout_type'] = $_cat['orderby'] = $_cat['comments'] = $_cat['item_per_page'] = $_cat['lg_column_item'] = $_cat['md_column_item'] = $_cat['sm_column_item'] = $_cat['xs_column_item'] = $_cat['page_layout'] = $_cat['page_title'] = $_cat['canonical_url'] = $_cat['layout_update_xml'] = $_cat['meta_keywords'] = $_cat['meta_description'] = $_cat['posts_style'] = $_cat['posts_template'] = $_cat['post_template'] = '';
 								}
-								$_cat['importing'] = true; 
+								$_cat['importing'] = true;
 								$category->setData($_cat)->save();
 								$cats[] = $this->drawItems($data, $_cat, 0, $category->getId());
 								$oldCategories = $this->_oldCategories;
@@ -126,12 +129,12 @@ public function execute()
 							// Image
 							$image = '';
 							$real_image_url = '';
-							$sql = "SELECT  ( SELECT guid FROM " . $prefix . "posts WHERE id = m.meta_value ) AS url 
+							$sql = "SELECT  ( SELECT guid FROM " . $prefix . "posts WHERE id = m.meta_value ) AS url
 							FROM " . $prefix . "posts p, " . $prefix . "postmeta m
 							WHERE p.post_type =  'post'
 							AND p.post_status =  'publish'
 							AND p.id = m.post_id
-							AND m.meta_key =  '_thumbnail_id' 
+							AND m.meta_key =  '_thumbnail_id'
 							AND p.id = '" . $data['ID'] . "'" ;
 							$result3 = $this->_mysqliQuery($sql);
 							if($result3){
@@ -146,8 +149,8 @@ public function execute()
 									}
 								}
 							}
-							
-							
+
+
 							// Tags
 							$postTags = [];
 							if($importTags){
@@ -257,7 +260,11 @@ public function execute()
 		}
 	}
 
-	public function decodeImg($str){
+	public function decodeImg($str)
+    {
+        if (!$str) {
+            return $str;
+        }
 		$count = substr_count($str, "<img");
 		$tmpImg = '';
 		for ($i=0; $i < $count; $i++) {
@@ -276,12 +283,14 @@ public function decodeImg($str){
 		return $str;
 	}
 
-	public function getCategory($cat_id = 0){
+	public function getCategory($cat_id = 0)
+    {
 		$category = $this->_categoryFactory->create();
 		return $category->load((int)$cat_id);
 	}
 
-	public function drawItems($collection, $cat, $level = 0, $parentId = ''){
+	public function drawItems($collection, $cat, $level = 0, $parentId = '')
+    {
 		$overwrite	   = $this->getData('overwrite');
 		$oldCategories = $this->_oldCategories;
 		foreach ($collection as $_cat) {
@@ -312,4 +321,4 @@ public function drawItems($collection, $cat, $level = 0, $parentId = ''){
 
 		return $cat;
 	}
-}
+}

composer.json

@@ -5,7 +5,7 @@
         "venustheme/module-all":"1.0.*"
     },
     "type": "magento2-module",
-    "version": "1.0.11",
+    "version": "1.0.12",
     "license": [
         "OSL-3.0",
         "AFL-3.0"