diff --git a/plugin/vchamilo/lib/Virtual.php b/plugin/vchamilo/lib/Virtual.php index 7548d58d10..5548cdb8f7 100644 --- a/plugin/vchamilo/lib/Virtual.php +++ b/plugin/vchamilo/lib/Virtual.php @@ -975,8 +975,9 @@ class Virtual /** * @param stdClass $data + * @param string $fromVersion */ - public static function importInstance($data) + public static function importInstance($data, $fromVersion) { if (isset($data->what)) { unset($data->what); @@ -1069,6 +1070,7 @@ class Virtual } if (!$id) { + var_dump($data); throw new Exception('Was not registered'); } @@ -1128,7 +1130,7 @@ class Virtual $outputStream = new \Symfony\Component\Console\Output\BufferedOutput($tmpFile); $arguments = array( - 'from-version' => '1.10.0', // @todo change value + 'from-version' => $fromVersion, // @todo change value 'to-version' => '1.11.x', 'host' => $newDatabase->db_host, 'username' => $newDatabase->db_user, diff --git a/plugin/vchamilo/views/import.php b/plugin/vchamilo/views/import.php index f3939debd6..c025dba1bd 100644 --- a/plugin/vchamilo/views/import.php +++ b/plugin/vchamilo/views/import.php @@ -53,6 +53,21 @@ $form->addSelect( $encryptList ); +$encryptList = Virtual::getEncryptList(); + +$versionList = [ + '1.11.x', + '1.10.x', + //'1.9.x' +]; + +$form->addSelect( + 'version', + get_lang('FromVersion'), + array_combine($versionList, $versionList) +); + + $form->addText( 'course_path', [ @@ -153,7 +168,7 @@ if ($form->validate()) { $vchamilo->upload_path = $values['upload_path']; $vchamilo->password_encryption = $values['password_encryption']; - Virtual::importInstance($vchamilo); + Virtual::importInstance($vchamilo, $values['version']); Virtual::redirect(api_get_path(WEB_PLUGIN_PATH).'vchamilo/views/manage.php'); }