From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 11 Sep 2017 16:59:17 +0000 (-0400)
Subject: Update the upload process
X-Git-Tag: v1.0.6^2~2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=edf5d2637d976cdbfcfeb3811868ce2854f45f9f;p=WP-Plugins%2Fglm-wp-importer.git

Update the upload process

Redo the pattern for searching for url with the files.
---

diff --git a/controllers/ToolboxImport.php b/controllers/ToolboxImport.php
index 38937ff..695f599 100644
--- a/controllers/ToolboxImport.php
+++ b/controllers/ToolboxImport.php
@@ -926,7 +926,7 @@
             global $wpdb;
             $currentPostArray = get_option(GLM_WP_IMPORT_POST_OPTION, array());
             $files = get_option(GLM_WP_IMPORT_FILES_OPTION, array());
-            echo '<pre>' . print_r($files, true) . '</pre>';
+            //echo '<pre>' . print_r($files, true) . '</pre>';
             //$images = get_option(GLM_WP_IMPORT_IMAGES_OPTION, array());
             //$media = array_merge($images, $files);
             //echo '<pre>' . print_r($media, true) . '</pre>';
@@ -941,10 +941,11 @@
                 foreach ($results as $post) {
                     $content = $post->post_content;
                     echo '<div style="border: 1px solid green; padding: 9px; margin: 10px;">';
-                    $urlPattern = '%<a href="(' . $this->_options['toolbox_files_url'] . '/[^">]*)" ?[^>]*>([^>]+)</a>%s';
+                    $urlPattern = '%<a href="(' .  $this->_options['toolbox_files_url'] . '/[^"]+)"%si';
+                    echo '<pre>$urlPattern: ' . htmlspecialchars( $urlPattern ) . '</pre>';
                     if (preg_match_all($urlPattern, $content, $isMatch)) {
                         $isMatchCount = count($isMatch[0]);
-                        echo '<p>Matches is0 ' . $isMatchCount . '</p>';
+                        echo '<p>Matches file url ' . $isMatchCount . '</p>';
                         for ($index = 0; $index < $isMatchCount; ++$index) {
                             echo '<pre>'.htmlspecialchars($isMatch[1][$index]).'</pre>';
                             //echo '<pre>'.htmlspecialchars(basename($isMatch[1][$index])).'</pre>';
@@ -952,16 +953,14 @@
                             $fileInfo = pathinfo($isMatch[1][$index]);
                             $fileName = $fileInfo['filename'];
                             echo '<pre>File Name: ' . print_r($fileName, true)  . '</pre>';
-                            echo '<pre>File Name: ' . print_r($fileInfo, true)  . '</pre>';
-                            $fileTitle = $isMatch[2][$index];
-                            echo '<pre>File Title: ' . print_r($fileTitle, true)  . '</pre>';
+                            echo '<pre>File Info: ' . print_r($fileInfo, true)  . '</pre>';
                             $key = $this->_getAttachmentByName($fileName);
                             echo '<pre>Key: ' . print_r($key, true)  . '</pre>';
                             // check on format of filename
-                            if (!$key && ($fileName && $fileTitle)) {
+                            if (!$key && ($fileName)) {
                                 $key = $this->_handleMediaFile(
                                     $fileInfo['basename'],
-                                    $fileTitle,
+                                    $fileName,
                                     '',
                                     $post->ID,
                                     $this->_options['toolbox_files_url'] . '/'