Improved Import

Author: ihorvansach

Block/Adminhtml/Import/Aheadworks/Form.php

@@ -72,16 +72,6 @@ protected function _prepareForm()
             ]
         );
 
-        $fieldset->addField(
-            'notice',
-            'label',
-            [
-                'label' => __('NOTICE'),
-                'name' => 'prefix',
-                'after_element_html' => 'When the import is completed successfully, please copy image files from AheadWorks <strong style="color:#bd1616;">aw-content/uploads</strong> directory to Magento <strong style="color:#105610;">pub/media/magefan_blog</strong> directory.',
-            ]
-        );
-
         $fieldset->addField(
             'dbname',
             'text',
@@ -115,7 +105,7 @@ protected function _prepareForm()
                 'label' => __('Password'),
                 'title' => __('Password'),
                 'name' => 'pwd',
-                'required' => true,
+                'required' => false,
                 'disabled' => $isElementDisabled,
                 'after_element_html' => '<small>…and your AW MySQL password.</small>',
             ]
@@ -141,7 +131,7 @@ protected function _prepareForm()
                 'label' => __('Table Prefix'),
                 'title' => __('Table Prefix'),
                 'name' => 'prefix',
-                'required' => true,
+                'required' => false,
                 'disabled' => $isElementDisabled,
                 'after_element_html' => '<small>…and your AW MySQL table prefix.</small>',
             ]
@@ -179,9 +169,11 @@ protected function _prepareForm()
 
         $this->_eventManager->dispatch('magefan_blog_import_aheadworks_prepare_form', ['form' => $form]);
 
+        /*
         if (empty($data['prefix'])) {
             $data['prefix'] = 'aw_';
         }
+        */
 
         if (empty($data['dbhost'])) {
             $data['dbhost'] = 'localhost';

Block/Adminhtml/Import/Wordpress/Form.php

@@ -119,7 +119,7 @@ protected function _prepareForm()
                 'label' => __('Password'),
                 'title' => __('Password'),
                 'name' => 'pwd',
-                'required' => true,
+                'required' => false,
                 'disabled' => $isElementDisabled,
                 'after_element_html' => '<small>…and your WP MySQL password.</small>',
             ]
@@ -145,7 +145,7 @@ protected function _prepareForm()
                 'label' => __('Table Prefix'),
                 'title' => __('Table Prefix'),
                 'name' => 'prefix',
-                'required' => true,
+                'required' => false,
                 'disabled' => $isElementDisabled,
                 'after_element_html' => '<small>…and your WP MySQL table prefix.</small>',
             ]

Model/Import/Aw.php

@@ -15,27 +15,10 @@
  */
 class Aw extends AbstractImport
 {
-    protected $_requiredFields = ['dbname', 'uname', 'pwd', 'dbhost', 'prefix'];
+    protected $_requiredFields = ['dbname', 'uname', 'dbhost'];
 
     public function execute()
     {
-        $config = \Magento\Framework\App\ObjectManager::getInstance()
-            ->get('Magento\Framework\App\DeploymentConfig');
-        $pref = ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT . '/';
-        $this->setData(
-            'dbhost',
-            $config->get($pref . ConfigOptionsListConstants::KEY_HOST)
-        )->setData(
-            'uname',
-            $config->get($pref . ConfigOptionsListConstants::KEY_USER)
-        )->setData(
-            'pwd',
-            $config->get($pref . ConfigOptionsListConstants::KEY_PASSWORD)
-        )->setData(
-            'dbname',
-            $config->get($pref . ConfigOptionsListConstants::KEY_NAME)
-        );
-
         $host = $this->getData('dbhost') ?: $this->getData('host');
         if (false !== strpos($host, '.sock')) {
             $con = $this->_connect = mysqli_connect(
@@ -59,10 +42,7 @@ public function execute()
             throw new \Exception("Failed connect to magento database", 1);
         }
 
-        $_pref = mysqli_real_escape_string(
-            $con,
-            $config->get($pref . ConfigOptionsListConstants::KEY_PREFIX)
-        );
+        $_pref = mysqli_real_escape_string($con, $this->getData('prefix'));
 
         $sql = 'SELECT * FROM '.$_pref.'aw_blog_cat LIMIT 1';
         try {

Model/Import/Wordpress.php

@@ -13,7 +13,7 @@
  */
 class Wordpress extends AbstractImport
 {
-    protected $_requiredFields = ['dbname', 'uname', 'pwd', 'dbhost', 'prefix'];
+    protected $_requiredFields = ['dbname', 'uname', 'dbhost'];
 
     public function execute()
     {
@@ -47,7 +47,6 @@ public function execute()
         while ($data = mysqli_fetch_assoc($result)) {
             /* Prepare category data */
             foreach (['title', 'identifier'] as $key) {
-                /*$data[$key] = utf8_encode($data[$key]);*/
                 $data[$key] = mb_convert_encoding($data[$key], 'HTML-ENTITIES', 'UTF-8');
             }
 
@@ -123,7 +122,6 @@ public function execute()
         while ($data = mysqli_fetch_assoc($result)) {
             /* Prepare tag data */
             foreach (['title', 'identifier'] as $key) {
-                /*$data[$key] = utf8_encode($data[$key]);*/
                 $data[$key] = mb_convert_encoding($data[$key], 'HTML-ENTITIES', 'UTF-8');
             }
 
@@ -217,7 +215,6 @@ public function execute()
 
             /* Prepare post data */
             foreach (['post_title', 'post_name', 'post_content'] as $key) {
-                /*$data[$key] = utf8_encode($data[$key]);*/
                 $data[$key] = mb_convert_encoding($data[$key], 'HTML-ENTITIES', 'UTF-8');
             }