From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 28 Dec 2015 20:34:50 +0000 (-0500)
Subject: Update for the files
X-Git-Tag: v0.0.3^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=c47a2bcf2913168f3afa7a6852efe27f723ecb83;p=WP-Plugins%2Fglm-wp-importer.git

Update for the files

When pulling files really need to know which url for the files.
Creating a new option for file URL. Which will be used for the
file uploads.
---

diff --git a/controllers/Admin.php b/controllers/Admin.php
index db0824d..194b4fc 100644
--- a/controllers/Admin.php
+++ b/controllers/Admin.php
@@ -137,6 +137,11 @@ class GlmWPImporter_Admin_Controller
                 'label' => 'Toolbox Files Table',
                 'type'  => 'text'
             ),
+            array(
+                'name'  => 'toolbox_files_url',
+                'label' => 'Toolbox Files URL',
+                'type'  => 'text'
+            ),
             array(
                 'name'  => 'ckeditor_schema',
                 'label' => 'CKEditor Schema',
diff --git a/controllers/ToolboxImport.php b/controllers/ToolboxImport.php
index 2d5581f..10a4df9 100644
--- a/controllers/ToolboxImport.php
+++ b/controllers/ToolboxImport.php
@@ -129,6 +129,9 @@
             if (!$this->_options['toolbox_files_table']) {
                 $errors[] = 'Toolbox Files Table';
             }
+            if (!$this->_options['toolbox_files_url']) {
+                $errors[] = 'Toolbox Files URL';
+            }
             return $errors;
         }
 
@@ -206,7 +209,7 @@
                 //return false;
             //}
             //$fileUrl = wp_get_attachment_url($file_id);
-            $fileUrl =$this->_options['toolbox_image_url'] . '/original/' . $data['filename'];
+            $fileUrl =$this->_options['toolbox_files_url'] . '/' . $data['filename'];
             $fileName = ($data['urltext']) ? $data['urltext'] : $data['filename'];
             return "\n".'<a href="'.$fileUrl.'">'.$fileName.'</a>';
         }
@@ -935,7 +938,7 @@
             $sql = "
             SELECT *
               FROM {$wpdb->prefix}posts
-             WHERE post_content LIKE '%http://is0.gaslightmedia.com%'
+             WHERE post_content LIKE '%{$this->_options['toolbox_files_url']}%'
                AND post_type = 'page'";
             $sql .= " AND ID IN (" . implode(',', $currentPostArray) . ")";
             $results = $wpdb->get_results($sql, OBJECT);
@@ -943,7 +946,7 @@
                 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_image_url'] . '/[^">]*)" ?[^>]*>([^>]+)</a>%s';
+                    $urlPattern = '%<a href="(' . $this->_options['toolbox_files_url'] . '/[^">]*)" ?[^>]*>([^>]+)</a>%s';
                     if (preg_match_all($urlPattern, $content, $isMatch)) {
                         $isMatchCount = count($isMatch[0]);
                         echo '<p>Matches is0 ' . $isMatchCount . '</p>';
@@ -966,7 +969,7 @@
                                     $fileTitle,
                                     '',
                                     $post->ID,
-                                    $this->_options['site_url'] . '/uploads/'
+                                    $this->_options['toolbox_files_url'] . '/'
                                 );
                             }
                             if ($key !== false) {