Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Make the Migration page accessible through admin.php?page=mailpoet-migration

Browse Source
This commit is contained in:
fred
2017-05-19 15:21:21 +02:00
parent 8517896660
commit 7bd52d456c
3 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Config/Changelog.php
View File

@ -36,7 +36,13 @@ class Changelog {
if($version === null) {
// new install
$redirect_url = admin_url('admin.php?page=mailpoet-welcome');
$mp2_migrator = new MP2Migrator();
if($mp2_migrator->isMigrationNeeded()) {
// Migration from MP2
$redirect_url = admin_url('admin.php?page=mailpoet-migration');
} else {
$redirect_url = admin_url('admin.php?page=mailpoet-welcome');
}
} else if($version !== Env::$version) {
// update
$redirect_url = admin_url('admin.php?page=mailpoet-update');

2
lib/Config/MP2Migrator.php
View File

@ -143,6 +143,8 @@ class MP2Migrator {
$this->importCustomFields();
$this->importSubscribers();
Setting::setValue('mailpoet_migration_complete', true);
$this->log(sprintf('=== ' . __('END IMPORT', 'mailpoet') . ' %s ===', $datetime->formatTime(time(), \MailPoet\WP\DateTime::DEFAULT_DATE_TIME_FORMAT)));
$result = ob_get_contents();
ob_clean();

47
lib/Config/Menu.php
View File

@ -1,7 +1,6 @@
<?php
namespace MailPoet\Config;
use MailPoet\Config\MP2Migrator;
use MailPoet\Cron\CronTrigger;
use MailPoet\Form\Block;
use MailPoet\Form\Renderer as FormRenderer;
@ -216,6 +215,18 @@ class Menu {
)
);
add_submenu_page(
true,
$this->setPageTitle(__('Migration', 'mailpoet')),
'',
Env::$required_permission,
'mailpoet-migration',
array(
$this,
'migration'
)
);
add_submenu_page(
true,
$this->setPageTitle(__('Update', 'mailpoet')),
@ -271,25 +282,23 @@ class Menu {
$redirect_url = admin_url('admin.php?page=mailpoet-newsletters');
}
$mp2_migrator = new MP2Migrator();
if($mp2_migrator->isMigrationNeeded()) {
$mp2_migrator->init();
$data = array(
'log_file_url' => $mp2_migrator->log_file_url,
'progress_url' => $mp2_migrator->progressbar->url,
);
$this->displayPage('mp2migration.html', $data);
} else {
$data = array(
'settings' => Setting::getAll(),
'current_user' => wp_get_current_user(),
'redirect_url' => $redirect_url,
'sub_menu' => 'mailpoet-newsletters'
);
$this->displayPage('welcome.html', $data);
}
$data = array(
'settings' => Setting::getAll(),
'current_user' => wp_get_current_user(),
'redirect_url' => $redirect_url,
'sub_menu' => 'mailpoet-newsletters'
);
$this->displayPage('welcome.html', $data);
}
function migration() {
$mp2_migrator = new MP2Migrator();
$mp2_migrator->init();
$data = array(
'log_file_url' => $mp2_migrator->log_file_url,
'progress_url' => $mp2_migrator->progressbar->url,
);
$this->displayPage('mp2migration.html', $data);
}
function update() {