<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14759] trunk/wp-admin:
Add install links to the importer list if popular importers are not present
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14759">14759</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-05-20 19:20:25 +0000 (Thu, 20 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add install links to the importer list if popular importers are not present. see <a href="http://trac.wordpress.org/ticket/13465">#13465</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminphp">trunk/wp-admin/admin.php</a></li>
<li><a href="#trunkwpadminimportphp">trunk/wp-admin/import.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin.php (14758 => 14759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin.php 2010-05-20 16:57:48 UTC (rev 14758)
+++ trunk/wp-admin/admin.php 2010-05-20 19:20:25 UTC (rev 14759)
</span><span class="lines">@@ -14,6 +14,9 @@
</span><span class="cx"> if ( !defined('WP_ADMIN') )
</span><span class="cx"> define('WP_ADMIN', TRUE);
</span><span class="cx">
</span><ins>+if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') )
+ define('WP_LOAD_IMPORTERS', true);
+
</ins><span class="cx"> require_once(dirname(dirname(__FILE__)) . '/wp-load.php');
</span><span class="cx">
</span><span class="cx"> if ( get_option('db_upgraded') ) {
</span></span></pre></div>
<a id="trunkwpadminimportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import.php (14758 => 14759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import.php 2010-05-20 16:57:48 UTC (rev 14758)
+++ trunk/wp-admin/import.php 2010-05-20 19:20:25 UTC (rev 14759)
</span><span class="lines">@@ -6,6 +6,8 @@
</span><span class="cx"> * @subpackage Administration
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+define('WP_LOAD_IMPORTERS', true);
+
</ins><span class="cx"> /** Load WordPress Bootstrap */
</span><span class="cx"> require_once ('admin.php');
</span><span class="cx">
</span><span class="lines">@@ -13,6 +15,7 @@
</span><span class="cx"> wp_die(__('You do not have sufficient permissions to import content in this site.'));
</span><span class="cx">
</span><span class="cx"> $title = __('Import');
</span><ins>+add_thickbox();
</ins><span class="cx"> require_once ('admin-header.php');
</span><span class="cx"> $parent_file = 'tools.php';
</span><span class="cx"> ?>
</span><span class="lines">@@ -39,8 +42,29 @@
</span><span class="cx"> }
</span><span class="cx"> @closedir($imports_dir);
</span><span class="cx">
</span><ins>+$popular_importers = array();
+if ( current_user_can('install_plugins') )
+ $popular_importers = array(
+ 'blogger' => array( __('Blogger'), __('Install the Blogger importer to import posts, comments, and users from a Blogger blog.'), 'install' ),
+ 'livejournal' => array( __( 'LiveJournal' ), __( 'Install the LiveJounral importer to import posts from LiveJournal using their API.' ), 'install' ),
+ 'mt' => array( __('Movable Type and TypePad'), __('Install the Movable Type importer to import posts and comments from a Movable Type or TypePad blog.'), 'install' ),
+ 'opml' => array( __('Blogroll'), __('Install the blogroll importer to import links in OPML format.'), 'install' ),
+ 'rss' => array( __('RSS'), __('Install the RSS importer to import posts from an RSS feed.'), 'install' ),
+ 'wordpress' => array( 'WordPress', __('Install the WordPress importer to import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.'), 'install' )
+ );
+
</ins><span class="cx"> $importers = get_importers();
</span><span class="cx">
</span><ins>+// If a popular importer is not registered, create a dummy registration that links to the plugin installer.
+foreach ( array_keys($popular_importers) as $pop_importer ) {
+ if ( isset($importers[$pop_importer] ) )
+ continue;
+
+ $importers[$pop_importer] = $popular_importers[$pop_importer];
+}
+
+uasort($importers, create_function('$a, $b', 'return strcmp($a[0], $b[0]);'));
+
</ins><span class="cx"> if (empty ($importers)) {
</span><span class="cx"> echo '<p>'.__('No importers are available.').'</p>'; // TODO: make more helpful
</span><span class="cx"> } else {
</span><span class="lines">@@ -51,7 +75,14 @@
</span><span class="cx"> $style = '';
</span><span class="cx"> foreach ($importers as $id => $data) {
</span><span class="cx"> $style = ('class="alternate"' == $style || 'class="alternate active"' == $style) ? '' : 'alternate';
</span><del>- $action = "<a href='admin.php?import=$id' title='".wptexturize(strip_tags($data[1]))."'>{$data[0]}</a>";
</del><ins>+ if ( 'install' == $data[2] ) {
+ $plugin_slug = $id . '-importer';
+ $action = '<a href="' . admin_url('plugin-install.php?tab=plugin-information&amp;plugin=' . $plugin_slug .
+ '&amp;TB_iframe=true&amp;width=600&amp;height=550') . '" class="thickbox" title="' .
+ esc_attr__('Install importer') . '">' . $data[0] . '</a>';
+ } else {
+ $action = "<a href='" . esc_url('admin.php?import=$id') . "' title='" . esc_attr( wptexturize(strip_tags($data[1])) ) ."'>{$data[0]}</a>";
+ }
</ins><span class="cx">
</span><span class="cx"> if ($style != '')
</span><span class="cx"> $style = 'class="'.$style.'"';
</span><span class="lines">@@ -66,6 +97,9 @@
</span><span class="cx"> </table>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><ins>+
+if ( current_user_can('install_plugins') )
+ echo '<p>' . sprintf('If the importer you need is not listed, <a href="%s">search the plugins directory</a> to see if an importer is available.', admin_url('plugin-install.php?tab=search&type=tag&s=importer') ) . '</p>';
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>