Merge branch 'master' of github.com:alchemy-fr/Phraseanet

lib/classes/module/console/systemUpgrade.class.php

@@ -37,10 +37,45 @@ class module_console_systemUpgrade extends Command
   public function execute(InputInterface $input, OutputInterface $output)
   {
     if (!setup::is_installed())
+    {
+
+      if (file_exists(dirname(__FILE__) . "/../../../../config/connexion.inc")
+              && !file_exists(dirname(__FILE__) . "/../../../../config/config.inc")
+              && file_exists(dirname(__FILE__) . "/../../../../config/_GV.php"))
+      {
+
+        $output->writeln('This version of Phraseanet requires a config/config.inc');
+        $output->writeln('Would you like it to be created based on your settings ?');
+        
+        $dialog = $this->getHelperSet()->get('dialog');
+        do
+        {
+          $continue = mb_strtolower($dialog->ask($output, '<question>' . _('Create automatically') . ' (Y/n)</question>', 'y'));
+        }
+        while (!in_array($continue, array('y', 'n')));
+      
+        if ($continue == 'y')
+        {
+          require __DIR__ . "/../../../../config/_GV.php";
+
+          $datas = '<?php'."\n"
+            .'$servername = "'.GV_ServerName.'";'."\n"
+            .'$maintenance=false;'."\n"
+            .'$debug=false;'."\n"
+            .'$debug=true;'."\n"
+            .'';
+        
+          file_put_contents(__DIR__ . "/../../../../config/config.inc", $datas);
+        }
+        else
         {  
           throw new RuntimeException('Phraseanet is not set up');
         }
 
+      }
+        
+    }
+
     require_once dirname(__FILE__) . '/../../../../lib/bootstrap.php';
 
     $output->write('Phraseanet is going to be upgraded', true);

lib/classes/task/period/archive.class.php

@@ -1541,6 +1541,7 @@ class task_period_archive extends task_abstract
         $record->set_metadatas($meta['metadatas']);
         $record->set_binary_status(databox_status::operation_or($stat0, $stat1));
         $record->rebuild_subdefs();
+        $record->reindex();
         $rid = $record->get_record_id();
         $this->log(sprintf((' (recordId %s)'), $rid));
         $this->archivedFiles++;
@@ -1881,6 +1882,7 @@ class task_period_archive extends task_abstract
         $record->set_metadatas($meta['metadatas']);
         $record->set_binary_status(databox_status::operation_or(databox_status::operation_or($stat0, $stat1), databox_status::hex2bin($hexstat)));
         $record->rebuild_subdefs();
+        $record->reindex();
 
         $rid = $record->get_record_id();
         if ($grp_rid !== NULL)