- | CSV |
- ".ADMIN_TRUE_ICON." |
- |
- |
- |
- |
- ".$frm->radio('import_type', 'csv')." |
";
+ ![](".e_PLUGIN."import/images/csv.png) CSV |
+ ".ADMIN_TRUE_ICON." | ";
+
+ for ($i=0; $i < count($db_import_blocks)-1; $i++)
+ {
+ $text .= " | ";
+ }
+
+
+ $text .= "".$frm->radio('import_type', 'csv')." | ";
foreach ($import_class_names as $k => $title)
{
+ $iconFile = e_PLUGIN."import/images/".str_replace("_import","",strtolower($k)).".png";
+ $icon = (file_exists($iconFile)) ? "
" : "";
+
$text .= "
- | ".$title." ".$import_class_comment[$k]." | \n";
+
| ".$icon.$title." ".$import_class_comment[$k]." | \n";
foreach($db_import_blocks as $key=>$val)
{
@@ -500,6 +563,15 @@ function showImportOptions($mode='csv')
";
}
+ elseif($mode == 'rss_import')
+ {
+ $text .= "
+ | Feed URL |
+
+
+ |
+
";
+ }
else
{
$importType = $import_class_names[$mode];
@@ -526,7 +598,13 @@ function showImportOptions($mode='csv')
|
-
+ ";
+
+ }
+
+ if($mode != 'csv')
+ {
+ $text .= "
| $importType ".LAN_CONVERT_24." |
";
@@ -540,9 +618,10 @@ function showImportOptions($mode='csv')
$text .= "
";
}
}
- $text .= " |
";
+ $text .= "";
}
+
$text .= "| ".LAN_CONVERT_38." |
".LAN_CONVERT_39." |
diff --git a/e107_plugins/import/images/coppermine.png b/e107_plugins/import/images/coppermine.png
new file mode 100644
index 000000000..5fefbe501
Binary files /dev/null and b/e107_plugins/import/images/coppermine.png differ
diff --git a/e107_plugins/import/images/drupal.png b/e107_plugins/import/images/drupal.png
new file mode 100644
index 000000000..63ecb58f4
Binary files /dev/null and b/e107_plugins/import/images/drupal.png differ
diff --git a/e107_plugins/import/images/e107.png b/e107_plugins/import/images/e107.png
new file mode 100644
index 000000000..5ead55e21
Binary files /dev/null and b/e107_plugins/import/images/e107.png differ
diff --git a/e107_plugins/import/images/ikonboard.png b/e107_plugins/import/images/ikonboard.png
new file mode 100644
index 000000000..4081f1006
Binary files /dev/null and b/e107_plugins/import/images/ikonboard.png differ
diff --git a/e107_plugins/import/images/joomla.png b/e107_plugins/import/images/joomla.png
new file mode 100644
index 000000000..86a7136a2
Binary files /dev/null and b/e107_plugins/import/images/joomla.png differ
diff --git a/e107_plugins/import/images/mambo.png b/e107_plugins/import/images/mambo.png
new file mode 100644
index 000000000..918f257e0
Binary files /dev/null and b/e107_plugins/import/images/mambo.png differ
diff --git a/e107_plugins/import/images/phpbb2.png b/e107_plugins/import/images/phpbb2.png
new file mode 100644
index 000000000..afeef591e
Binary files /dev/null and b/e107_plugins/import/images/phpbb2.png differ
diff --git a/e107_plugins/import/images/phpnuke.png b/e107_plugins/import/images/phpnuke.png
new file mode 100644
index 000000000..0f55e0bff
Binary files /dev/null and b/e107_plugins/import/images/phpnuke.png differ
diff --git a/e107_plugins/import/images/smf.png b/e107_plugins/import/images/smf.png
new file mode 100644
index 000000000..4ad92b8ff
Binary files /dev/null and b/e107_plugins/import/images/smf.png differ
diff --git a/e107_plugins/import/images/wordpress.png b/e107_plugins/import/images/wordpress.png
new file mode 100644
index 000000000..22815daa6
Binary files /dev/null and b/e107_plugins/import/images/wordpress.png differ
diff --git a/e107_plugins/import/import_classes.php b/e107_plugins/import/import_classes.php
index d013f8a98..0acd36575 100644
--- a/e107_plugins/import/import_classes.php
+++ b/e107_plugins/import/import_classes.php
@@ -20,96 +20,169 @@ Root classes for import and saving of data. Application-specific classes build o
class base_import_class
{
- var $ourDB = NULL;
- var $DBPrefix = '';
- var $currentTask = '';
- var $copyUserInfo = TRUE;
+ var $ourDB = NULL;
+ var $DBPrefix = '';
+ var $currentTask = '';
+ var $copyUserInfo = TRUE;
+ var $arrayData = array();
-
- // Connect to the external DB if not already connected
- function db_Connect($server, $user, $password, $database, $prefix)
- {
- if ($this->ourDB == NULL)
+ /**
+ * Connect to the external DB if not already connected
+ */
+ function db_Connect($server, $user, $password, $database, $prefix)
{
- $this->ourDB = new db;
- $result = $this->ourDB->db_Connect($server, $user, $password, $database);
- $this->DBPrefix = $prefix;
- if ($result)
- {
- return $result;
- }
+ if ($this->ourDB == NULL)
+ {
+ $this->ourDB = new db;
+ $result = $this->ourDB->db_Connect($server, $user, $password, $database);
+ $this->DBPrefix = $prefix;
+ if ($result)
+ {
+ return $result;
+ }
+ }
+
+ return TRUE;
}
- return TRUE;
- }
-
- // Set up a query for the specified task. If $blank_user is TRUE, user ID Data in source data is ignored
- // Returns TRUE on success. FALSE on error
- function setupQuery($task, $blank_user=FALSE)
- {
- return FALSE;
- }
-
-
- function saveData($dataRecord)
- {
- switch($this->currentTask)
+ /**
+ * Set up a query for the specified task. If $blank_user is TRUE, user ID Data in source data is ignored
+ * @return boolean TRUE on success. FALSE on error
+ */
+ function setupQuery($task, $blank_user=FALSE)
{
- case 'users' :
- return $this->saveUserData($dataRecord);
- break;
- case 'forumdefs' :
- return $this->saveForumData($dataRecord);
- return FALSE;
- case 'forumposts' :
- return $this->savePostData($dataRecord);
- return FALSE;
- case 'polls' :
- return FALSE;
- case 'news' :
- return FALSE;
+ return FALSE;
}
- return FALSE;
+
+
+ function saveData($dataRecord)
+ {
+ switch($this->currentTask)
+ {
+ case 'users' :
+ return $this->saveUserData($dataRecord);
+ break;
+
+ case 'news' :
+ return $this->saveNewsData($dataRecord);
+ break;
+
+ case 'page' :
+ return $this->savePageData($dataRecord);
+ break;
+
+ case 'links' :
+ return $this->saveLinksData($dataRecord);
+ break;
+
+ case 'media' :
+ return $this->saveMediaData($dataRecord);
+ break;
+
+ case 'forumdefs' :
+ return $this->saveForumData($dataRecord);
+ break;
+
+ case 'forumposts' :
+ return $this->savePostData($dataRecord);
+ break;
+
+ case 'polls' :
+ break;
+ }
+
+ return FALSE;
}
// Return the next record as an array. All data has been converted to the appropriate E107 formats
// Return FALSE if no more data
// Its passed a record initialised with the default values
- function getNext($initial)
- {
- $result = $this->ourDB->db_Fetch();
- if (!$result) return FALSE;
- switch($this->currentTask)
+ function getNext($initial,$mode='db')
{
- case 'users' :
- return $this->copyUserData($initial, $result);
- break;
- case 'forumdefs' :
- return FALSE;
- case 'forumposts' :
- return FALSE;
- case 'polls' :
- return FALSE;
- case 'news' :
- return FALSE;
+ if($mode == 'db')
+ {
+ $result = $this->ourDB->db_Fetch();
+ }
+ else
+ {
+ $result = current($this->arrayData);
+ next($this->arrayData);
+ }
+
+
+ if (!$result) return FALSE;
+ switch($this->currentTask)
+ {
+ case 'users' :
+ return $this->copyUserData($initial, $result);
+ break;
+
+ case 'news' :
+ return $this->copyNewsData($initial, $result);
+ break;
+
+ case 'page' :
+ return $this->copyPageData($initial, $result);
+ break;
+
+ case 'links' :
+ return $this->copyLinksData($initial, $result);
+ break;
+
+ case 'media' :
+ return $this->copyMediaData($initial, $result);
+ break;
+
+ case 'forumdefs' :
+ break;
+
+ case 'forumposts' :
+ break;
+
+ case 'polls' :
+ break;
+
+
+ }
+
+ return FALSE;
}
- return FALSE;
- }
- // Called to signal that current task is complete; tidy up as required
- function endQuery()
- {
- $this->currentTask = '';
- }
+ // Called to signal that current task is complete; tidy up as required
+ function endQuery()
+ {
+ $this->currentTask = '';
+ }
- // Empty function which descendants can inherit from
- function copyUserData(&$target, &$source)
- {
- return $target;
- }
+ // Empty functions which descendants can inherit from
+
+ function copyUserData(&$target, &$source)
+ {
+ return $target;
+ }
+
+ function copyNewsData(&$target, &$source)
+ {
+ return $target;
+ }
+
+ function copyPageData(&$target, &$source)
+ {
+ return $target;
+ }
+
+ function copyLinksData(&$target, &$source)
+ {
+ return $target;
+ }
+
+ function copyMediaData(&$target, &$source)
+ {
+ return $target;
+ }
}
diff --git a/e107_plugins/import/languages/English_admin_import.php b/e107_plugins/import/languages/English_admin_import.php
index ebe184769..9ccbc74b3 100644
--- a/e107_plugins/import/languages/English_admin_import.php
+++ b/e107_plugins/import/languages/English_admin_import.php
@@ -73,5 +73,5 @@ define('LAN_CONVERT_43','Error connecting to source database');
define('LAN_CONVERT_44','Query setup error for ');
define('LAN_CONVERT_45','Cannot read import code file');
define('LAN_CONVERT_46','Error: --ERRNUM-- while writing to --DB-- database, line ');
-define('LAN_CONVERT_47','Block --BLOCK-- import completed. --LINES-- read, --USERS-- added, --ERRORS-- errors');
+define('LAN_CONVERT_47','Batch --BLOCK-- import completed. --LINES-- read, --USERS-- added, --ERRORS-- errors');
define('LAN_CONVERT_48','Forum posts');
diff --git a/e107_plugins/import/PHPFusion_import_class.php b/e107_plugins/import/providers/PHPFusion_import_class.php
similarity index 100%
rename from e107_plugins/import/PHPFusion_import_class.php
rename to e107_plugins/import/providers/PHPFusion_import_class.php
diff --git a/e107_plugins/import/PHPNuke_import_class.php b/e107_plugins/import/providers/PHPNuke_import_class.php
similarity index 100%
rename from e107_plugins/import/PHPNuke_import_class.php
rename to e107_plugins/import/providers/PHPNuke_import_class.php
diff --git a/e107_plugins/import/coppermine_import_class.php b/e107_plugins/import/providers/coppermine_import_class.php
similarity index 100%
rename from e107_plugins/import/coppermine_import_class.php
rename to e107_plugins/import/providers/coppermine_import_class.php
diff --git a/e107_plugins/import/drupal_import_class.php b/e107_plugins/import/providers/drupal_import_class.php
similarity index 100%
rename from e107_plugins/import/drupal_import_class.php
rename to e107_plugins/import/providers/drupal_import_class.php
diff --git a/e107_plugins/import/e107_import_class.php b/e107_plugins/import/providers/e107_import_class.php
similarity index 100%
rename from e107_plugins/import/e107_import_class.php
rename to e107_plugins/import/providers/e107_import_class.php
diff --git a/e107_plugins/import/ikonboard_import_class.php b/e107_plugins/import/providers/ikonboard_import_class.php
similarity index 100%
rename from e107_plugins/import/ikonboard_import_class.php
rename to e107_plugins/import/providers/ikonboard_import_class.php
diff --git a/e107_plugins/import/providers/joomla_import_class.php b/e107_plugins/import/providers/joomla_import_class.php
new file mode 100644
index 000000000..e8f37d4f0
--- /dev/null
+++ b/e107_plugins/import/providers/joomla_import_class.php
@@ -0,0 +1,83 @@
+ourDB == NULL) return FALSE;
+ switch ($task)
+ {
+ case 'users' :
+ $result = $this->ourDB->db_Select_gen("SELECT * FROM {$this->DBPrefix}users");
+ if ($result === FALSE) return FALSE;
+ break;
+ default :
+ return FALSE;
+ }
+ $this->copyUserInfo = !$blank_user;
+ $this->currentTask = $task;
+ return TRUE;
+ }
+
+
+ //------------------------------------
+ // Internal functions below here
+ //------------------------------------
+
+ // Copy data read from the DB into the record to be returned.
+ function copyUserData(&$target, &$source)
+ {
+ if ($this->copyUserInfo) $target['user_id'] = $source['id'];
+ $target['user_name'] = $source['name'];
+ $target['user_loginname'] = $source['username'];
+ $target['user_password'] = $source['password'];
+ $target['user_email'] = $source['email'];
+// $target['user_hideemail'] = $source['user_viewemail'];
+ $target['user_join'] = $source['registerDate'];
+ $target['user_admin'] = ($source['usertype'] == 'superadministrator') ? 1 : 0;
+
+ if ($target['user_admin'] != 0)
+ {
+ $target['user_perms'] = '0.';
+ }
+
+ $target['user_lastvisit'] = $source['lastvisitDate'];
+ $target['user_login'] = $source['name'];
+ $target['user_ban'] = ($source['block'] ? 2 : 0);
+
+ return $target;
+ }
+
+}
+
+
+?>
\ No newline at end of file
diff --git a/e107_plugins/import/mambo_import_class.php b/e107_plugins/import/providers/mambo_import_class.php
similarity index 100%
rename from e107_plugins/import/mambo_import_class.php
rename to e107_plugins/import/providers/mambo_import_class.php
diff --git a/e107_plugins/import/phpbb2_import_class.php b/e107_plugins/import/providers/phpbb2_import_class.php
similarity index 100%
rename from e107_plugins/import/phpbb2_import_class.php
rename to e107_plugins/import/providers/phpbb2_import_class.php
diff --git a/e107_plugins/import/providers/rss_import_class.php b/e107_plugins/import/providers/rss_import_class.php
new file mode 100644
index 000000000..94054db4a
--- /dev/null
+++ b/e107_plugins/import/providers/rss_import_class.php
@@ -0,0 +1,294 @@
+setOptArrayTags('plugin'); // make sure 'plugin' tag always returns an array
+
+
+ switch ($task)
+ {
+ case 'users' :
+ //$query = "SELECT * FROM {$this->DBPrefix}users WHERE `user_id` != 1";
+
+ break;
+
+ case 'news' :
+ // $result = $xml->loadXMLfile($file,true);
+ // $rawData = $xml->getRemoteFile($file);
+ // $rss = new MagpieRSS( $rawData );
+ // $array = $xml->xml2array($rss);
+
+ $xml->setOptArrayTags('item'); // make sure 'plugin' tag always returns an array
+ $array = $xml->loadXMLfile($file,'advanced');
+ $this->arrayData = $array['channel']['item'];
+
+ if ($result === FALSE) return FALSE;
+ break;
+
+ case 'page' :
+
+ if ($result === FALSE) return FALSE;
+ break;
+
+ case 'media' :
+
+ break;
+
+ case 'links':
+
+ if ($result === FALSE) return FALSE;
+ break;
+
+ default :
+ return FALSE;
+ }
+
+ $this->copyUserInfo = !$blank_user;
+ $this->currentTask = $task;
+ return TRUE;
+ }
+
+
+ //------------------------------------
+ // Internal functions below here
+ //------------------------------------
+
+ /**
+ * Align source data to e107 User Table
+ * @param $target array - default e107 target values for e107_user table.
+ * @param $source array - WordPress table data
+ */
+ function copyUserData(&$target, &$source)
+ {
+
+ }
+
+ /**
+ * Align source data to e107 News Table
+ * @param $target array - default e107 target values for e107_news table.
+ * @param $source array - WordPress table data
+ */
+ function copyNewsData(&$target, &$source)
+ {
+ /* Example:
+ [ID] => 88
+ [post_author] => 1
+ [post_date] => 2012-01-25 04:11:22
+ [post_date_gmt] => 2012-01-25 09:11:22
+ [post_content] => [gallery itemtag="div" icontag="span" captiontag="p" link="file"]
+ [post_title] => Media Gallery
+ [post_excerpt] =>
+ [post_status] => inherit
+ [comment_status] => open
+ [ping_status] => open
+ [post_password] =>
+ [post_name] => 10-revision-6
+ [to_ping] =>
+ [pinged] =>
+ [post_modified] => 2012-01-25 04:11:22
+ [post_modified_gmt] => 2012-01-25 09:11:22
+ [post_content_filtered] =>
+ [post_parent] => 10
+ [guid] => http://siteurl.com/2012/01/25/10-revision-6/
+ [menu_order] => 0
+ [post_type] => post
+ [post_mime_type] =>
+ [comment_count] => 0
+ */
+
+ // $target['news_id'] = $source['ID'];
+ $target['news_title'] = $source['post_title'];
+ $target['news_sef'] = $source['post_name'];
+ $target['news_body'] = $source['post_content'];
+ // $target['news_extended'] = '';
+ // $target['news_meta_keywords'] = '';
+ // $target['news_meta_description'] = '';
+ $target['news_datestamp'] = strtotime($source['post_date']);
+ $target['news_author'] = $source['post_author'];
+ // $target['news_category'] = '';
+ $target['news_allow_comments'] = ($source['comment_status']=='open') ? 1 : 0;
+ $target['news_start'] = '';
+ $target['news_end'] = '';
+ $target['news_class'] = '';
+ $target['news_render_type'] = '';
+ $target['news_comment_total'] = $source['comment_count'];
+ $target['news_summary'] = $source['post_excerpt'];
+ $target['news_thumbnail'] = '';
+ $target['news_sticky'] = '';
+
+ // return $target; // comment out to debug
+
+ // DEBUG INFO BELOW.
+ $this->renderDebug($source,$target);
+ }
+
+
+
+
+ /**
+ * Align source data to e107 Page Table
+ * @param $target array - default e107 target values for e107_page table.
+ * @param $source array - WordPress table data
+ */
+ function copyPageData(&$target, &$source)
+ {
+ $tp = e107::getParser();
+ /* post_status:
+ publish - A published post or page
+ inherit - a revision
+ pending - post is pending review
+ private - a private post
+ future - a post to publish in the future
+ draft - a post in draft status
+ trash - post is in trashbin (available with 2.9)
+ */
+
+ if($source['post_status']=='private' || $source['post_status']=='future' || $source['post_status'] == 'draft')
+ {
+ $target['page_class'] = e_UC_ADMIN;
+ }
+
+ // $target['page_id'] = $source['ID']; // auto increment
+ $target['page_title'] = $source['post_title'];
+ $target['page_sef'] = $source['post_name'];
+ $target['page_text'] = "[html]".$source['post_content']."[/html]";
+ $target['page_metakeys'] = '';
+ $target['page_metadscr'] = '';
+ $target['page_datestamp'] = strtotime($source['post_date']);
+ $target['page_author'] = $source['post_author'];
+ // $target['page_category'] = '',
+ $target['page_comment_flag'] = ($source['comment_status']=='open') ? 1 : 0;
+ $target['page_password'] = $source['post_password'];
+
+ return $target; // comment out to debug
+
+ // DEBUG INFO BELOW.
+ $this->renderDebug($source,$target);
+
+ }
+
+
+ /**
+ * Align source data to e107 Links Table
+ * @param $target array - default e107 target values for e107_links table.
+ * @param $source array - WordPress table data
+ */
+ function copyLinksData(&$target, &$source)
+ {
+ $tp = e107::getParser();
+ /* WP
+ link_id
+ link_url
+ link_name
+ link_image
+ link_target
+ link_description
+ link_visible
+ link_owner
+ link_rating
+ link_updated
+ link_rel
+ link_notes
+ link_rss
+ *
+ * e107
+ * link_id
+ link_name
+ link_url
+ link_description
+ link_button
+ link_category
+ link_order
+ link_parent
+ link_open
+ link_class
+ link_function
+ link_sefurl
+ */
+
+
+ // $target['page_id'] = $source['ID']; // auto increment
+ $target['link_name'] = $source['post_title'];
+ $target['link_url'] = $source['post_name'];
+ $target['link_description'] = "[html]".$source['post_content']."[/html]";
+ $target['link_button'] = '';
+ $target['link_category'] = '';
+ $target['link_order'] = strtotime($source['post_date']);
+ $target['link_parent'] = $source['post_author'];
+ $target['link_open'] = '';
+ $target['link_class'] = '';
+ $target['link_sefurl'] = $source['post_password'];
+
+ // return $target; // comment out to debug
+
+ // DEBUG INFO BELOW.
+ $this->renderDebug($source,$target);
+
+ }
+
+
+
+
+
+
+
+
+
+
+ function renderDebug($source,$target)
+ {
+ echo "
+
+
+
+ | ".print_a($source,TRUE)." |
+ ".print_a($target,TRUE)." |
+
+
+
+
+
+ | ".print_a($source,TRUE)." |
+ ".print_a($target,TRUE)." |
+
+
+