diff options
| author | zotlabs <mike@macgirvin.com> | 2017-01-09 14:37:56 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-01-09 14:37:56 -0800 |
| commit | a6272fcf769c3fc7c3834b3183dfbe25ec738550 (patch) | |
| tree | b72e480213ace2bc47e5c252ef4ff0688c99ed14 /Zotlabs | |
| parent | 91e0733e8ef0640df20c18e91c61564458b091d1 (diff) | |
| download | volse-hubzilla-a6272fcf769c3fc7c3834b3183dfbe25ec738550.tar.gz volse-hubzilla-a6272fcf769c3fc7c3834b3183dfbe25ec738550.tar.bz2 volse-hubzilla-a6272fcf769c3fc7c3834b3183dfbe25ec738550.zip | |
channel move stuff (disabled currently because not yet complete)
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Import.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index 451effaca..aa79fa8bf 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -118,7 +118,7 @@ class Import extends \Zotlabs\Web\Controller { return; } - $moving = false; + $moving = intval($_REQUEST['moving']); if(array_key_exists('compatibility',$data) && array_key_exists('database',$data['compatibility'])) { $v1 = substr($data['compatibility']['database'],-4); @@ -196,8 +196,8 @@ class Import extends \Zotlabs\Web\Controller { if($completed < 4) { - if(is_array($data['hubloc']) && (! $moving)) { - import_hublocs($channel,$data['hubloc'],$seize); + if(is_array($data['hubloc'])) { + import_hublocs($channel,$data['hubloc'],$seize,$moving); } logger('import step 4'); @@ -536,6 +536,9 @@ class Import extends \Zotlabs\Web\Controller { '$label_old_pass' => t('Your old login password'), '$common' => t('For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media.'), '$label_import_primary' => t('Make this hub my primary location'), + '$allow_move' => 0, + '$label_import_moving' => t('Move this channel (disable all previous locations)'), + '$label_import_posts' => t('Import existing posts if possible (experimental - limited by available memory'), '$pleasewait' => t('This process may take several minutes to complete. Please submit the form only once and leave this page open until finished.'), '$email' => '', |