diff --git a/bin/console b/bin/console
index 433d4c7128..6cff909481 100755
--- a/bin/console
+++ b/bin/console
@@ -24,8 +24,11 @@ use Alchemy\Phrasea\Command\Thesaurus\FindConceptsCommand;
use Alchemy\Phrasea\Core\Version;
use Alchemy\Phrasea\Command\CreateCollection;
use Alchemy\Phrasea\Command\Collection\UnPublishCollectionCommand;
+use Alchemy\Phrasea\Command\Collection\PublishCollectionCommand;
use Alchemy\Phrasea\Command\Collection\ListCollectionCommand;
use Alchemy\Phrasea\Command\Databox\CreateDataboxCommand;
+use Alchemy\Phrasea\Command\Databox\UnMountDataboxCommand;
+use Alchemy\Phrasea\Command\Databox\MountDataboxCommand;
use Alchemy\Phrasea\Command\Databox\ListDataboxCommand;
use Alchemy\Phrasea\Command\MailTest;
use Alchemy\Phrasea\Command\Compile\Configuration;
@@ -114,14 +117,15 @@ $cli->command(new \module_console_fieldsRename('fields:rename'));
$cli->command(new \module_console_fieldsMerge('fields:merge'));
$cli->command(new CreateCollection('collection:create'));
-
$cli->command(new UnPublishCollectionCommand('collection:unpublish'));
-
+$cli->command(new PublishCollectionCommand('collection:publish'));
$cli->command(new ListCollectionCommand('collection:list'));
$cli->command(new ListDataboxCommand('databox:list'));
-
$cli->command(new CreateDataboxCommand('databox:create'));
+$cli->command(new UnMountDataboxCommand('databox:unmount'));
+$cli->command(new MountDataboxCommand('databox:mount'));
+
$cli->command(new UserCreateCommand('user:create'));
diff --git a/lib/Alchemy/Phrasea/Command/Collection/PublishCollectionCommand.php b/lib/Alchemy/Phrasea/Command/Collection/PublishCollectionCommand.php
new file mode 100644
index 0000000000..6cfac3a388
--- /dev/null
+++ b/lib/Alchemy/Phrasea/Command/Collection/PublishCollectionCommand.php
@@ -0,0 +1,61 @@
+setDescription('Publish collection in Phraseanet')
+ ->addOption('collection_id', null, InputOption::VALUE_REQUIRED, 'The base_id of the collection to publish but keep with existing right into present in application box.')
+ ->setHelp('');
+
+ return $this;
+ }
+
+ protected function doExecute(InputInterface $input, OutputInterface $output)
+ {
+ try {
+
+ $collection = \collection::getByBaseId($this->container,(int)$input->getOption('collection_id'));
+ $dialog = $this->getHelperSet()->get('dialog');
+
+ do {
+ $continue = mb_strtolower($dialog->ask($output, ' Do you want really publish this collection? (y/N)', 'N'));
+ } while ( ! in_array($continue, ['y', 'n']));
+
+ if ($continue !== 'y') {
+ $output->writeln('Aborting !');
+
+ return;
+ }
+
+ $collection->enable($this->container->getApplicationBox());
+ $output->writeln('Publish collection successful');
+ } catch (\Exception $e) {
+ $output->writeln('Publish collection failed : '.$e->getMessage().'');
+ }
+
+ return 0;
+ }
+
+}
diff --git a/lib/Alchemy/Phrasea/Command/Databox/MountDataboxCommand.php b/lib/Alchemy/Phrasea/Command/Databox/MountDataboxCommand.php
index ce77c7dbb2..bcfe53ae4f 100644
--- a/lib/Alchemy/Phrasea/Command/Databox/MountDataboxCommand.php
+++ b/lib/Alchemy/Phrasea/Command/Databox/MountDataboxCommand.php
@@ -1,7 +1,16 @@
setName('databox:mount')
- ->addArgument('databox', InputArgument::REQUIRED, 'Database name for the databox', null)
- ->addArgument('owner', InputArgument::REQUIRED, 'Email of the databox admin user', null)
- ->addOption('connection', 'c', InputOption::VALUE_NONE, 'Flag to set new database settings')
- ->addOption('db-host', null, InputOption::VALUE_OPTIONAL, 'MySQL server host', 'localhost')
- ->addOption('db-port', null, InputOption::VALUE_OPTIONAL, 'MySQL server port', 3306)
- ->addOption('db-user', null, InputOption::VALUE_OPTIONAL, 'MySQL server user', 'phrasea')
- ->addOption('db-password', null, InputOption::VALUE_OPTIONAL, 'MySQL server password', null);
+ parent::__construct('databox:mount');
+
+ $this->setDescription('Mount databox')
+ ->addArgument('databox', InputArgument::REQUIRED, 'Database name in Mysql', null)
+ ->addArgument('user_id', InputArgument::REQUIRED, 'The Id of user owner (this account became full admin on this databox)', null)
+ ->addOption('db-host', null, InputOption::VALUE_OPTIONAL, 'MySQL server host')
+ ->addOption('db-port', null, InputOption::VALUE_OPTIONAL, 'MySQL server port')
+ ->addOption('db-user', null, InputOption::VALUE_OPTIONAL, 'MySQL server user')
+ ->addOption('db-password', null, InputOption::VALUE_OPTIONAL, 'MySQL server password')
+ ;
+
+ return $this;
}
protected function doExecute(InputInterface $input, OutputInterface $output)
{
- $databoxName = $input->getArgument('databox');
- $connectionSettings = $input->getOption('connection') == false ? null : new DataboxConnectionSettings(
- $input->getOption('db-host'),
- $input->getOption('db-port'),
- $input->getOption('db-user'),
- $input->getOption('db-password')
- );
+ try {
- /** @var UserRepository $userRepository */
- $userRepository = $this->container['repo.users'];
- /** @var DataboxService $databoxService */
- $databoxService = $this->container['databox.service'];
+ /** @var UserRepository $userRepository */
+ $userRepository = $this->container['repo.users'];
- $owner = $userRepository->findByEmail($input->getArgument('owner'));
+ $owner = $userRepository->find($input->getArgument('user_id'));
- $databoxService->mountDatabox(
- $databoxName,
- $owner,
- $connectionSettings
- );
+ if (empty($owner)) {
+ $output->writeln('User not found ! ');
- $output->writeln('Databox mounted');
+ return;
+ }
+
+ if ($owner->isGuest() || !$this->container->getAclForUser($owner)->is_admin()) {
+ $output->writeln('Admin role is required for the owner ! ');
+
+ return;
+ }
+
+ $databoxName = $input->getArgument('databox');
+ $dialog = $this->getHelperSet()->get('dialog');
+
+ $connectionSettings = new DataboxConnectionSettings(
+ $input->getOption('db-host')?:$this->container['conf']->get(['main', 'database', 'host']),
+ $input->getOption('db-port')?:$this->container['conf']->get(['main', 'database', 'port']),
+ $input->getOption('db-user')?:$this->container['conf']->get(['main', 'database', 'user']),
+ $input->getOption('db-password')?:$this->container['conf']->get(['main', 'database', 'password'])
+ );
+
+ do {
+ $continue = mb_strtolower($dialog->ask($output, ' Do you want really mount this databox? (y/N)', 'N'));
+ }
+ while ( ! in_array($continue, ['y', 'n']));
+
+ if ($continue !== 'y') {
+ $output->writeln('Aborting !');
+
+ return;
+ }
+
+ /** @var DataboxService $databoxService */
+ $databoxService = $this->container['databox.service'];
+
+ \phrasea::clear_sbas_params($this->container);
+
+ $databox = $databoxService->mountDatabox(
+ $databoxName,
+ $owner,
+ $connectionSettings
+ );
+
+ $output->writeln("\n\tData-Box ID ".$databox->get_sbas_id()." mounted successful !\n");
+ } catch (\Exception $e) {
+ $output->writeln('Mount databox failed :'.$e->getMessage().'');
+ }
+
+ return 0;
}
+
}
diff --git a/lib/Alchemy/Phrasea/Command/Databox/UnMountDataboxCommand.php b/lib/Alchemy/Phrasea/Command/Databox/UnMountDataboxCommand.php
new file mode 100644
index 0000000000..42199a519f
--- /dev/null
+++ b/lib/Alchemy/Phrasea/Command/Databox/UnMountDataboxCommand.php
@@ -0,0 +1,60 @@
+setDescription('Unmount databox')
+ ->addArgument('databox_id', InputArgument::REQUIRED, 'The id of the databox to unmount', null)
+ ;
+
+ return $this;
+ }
+
+ protected function doExecute(InputInterface $input, OutputInterface $output)
+ {
+ try {
+ $databox = $this->container->findDataboxById($input->getArgument('databox_id'));
+ $dialog = $this->getHelperSet()->get('dialog');
+
+ do {
+ $continue = mb_strtolower($dialog->ask($output, ' Do you want really unmount this databox? (y/N)', 'N'));
+ } while ( ! in_array($continue, ['y', 'n']));
+
+ if ($continue !== 'y') {
+ $output->writeln('Aborting !');
+
+ return;
+ }
+
+ $databox->unmount_databox();
+ $output->writeln('Unmount databox successful');
+ } catch (\Exception $e) {
+ $output->writeln('Unmount databox failed : '.$e->getMessage().'');
+ }
+
+ return 0;
+ }
+
+}