From 7d5a03f45ad924bbfc318d2efa8491cec3ac622a Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Tue, 20 Dec 2011 16:50:27 +0100
Subject: [PATCH 1/3] Fix bug #104 : record not indexed after having been
 archived

---
 lib/classes/task/period/archive.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/classes/task/period/archive.class.php b/lib/classes/task/period/archive.class.php
index 6ac40734c7..4299bbebd1 100644
--- a/lib/classes/task/period/archive.class.php
+++ b/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)

From ca6df7d28ca72f1363c32a9822d4a0d4dc5e22ca Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Tue, 20 Dec 2011 16:52:32 +0100
Subject: [PATCH 2/3] Merge Archiving bug

---
 lib/vendor/symfony                          |   2 +-
 www/skins/icons/substitution/image_jpeg.png | Bin 130312 -> 130491 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vendor/symfony b/lib/vendor/symfony
index 6924e63587..4316595dbb 160000
--- a/lib/vendor/symfony
+++ b/lib/vendor/symfony
@@ -1 +1 @@
-Subproject commit 6924e63587466c865ca8dc746ff3fcf5cd1a1dcf
+Subproject commit 4316595dbb7be9dcf2156d090d52f23f11b1ea90
diff --git a/www/skins/icons/substitution/image_jpeg.png b/www/skins/icons/substitution/image_jpeg.png
index 7573f145ff861064e4c90a005c4556183eac7ed2..ade94258adb66ff964f52b64ac148c71badbe9e3 100644
GIT binary patch
delta 247
zcmV<T00{qx`UkuF2Y|Ez(fohadQ@0+Qek%>aB^>EX>4U6ba`-PAVE-2F#rH~oMlg2
z4#F@D`|l}sgfvdl_Be%YXc7X%{Xa-shNj`Fit~2DZFwy3?K-{Q&vm;mVQOHaAeyoj
zGjhl*GZ9xB$o`dLtlbX8VWfKea*T&zl__#-#G!#Z<A_td56j6)n|Ny;w5#|+@=3wb
z*D`q8i$UN3fJ*EIzl3|-G}QkFmxmUQN0qCiE2`437^e__?=II}pD8l3MI?U;<rxMx
xwZ_D=f)bn-S0zZ!U~QwK7)(sOT%7gI;R7<ISg3i$ar6KH002ovPDHLkV1l#4bYTDh

delta 67
zcmdn}o4w-~d&3sSi+{|OszM@4g7ec#$`gxH85k;VY3u7>KYix3o}ZtN$JNvNUhE8J
WH`pQsf=|UT0D-5gpUXO@geCya%NgJR


From fb800696bae694b10332f9afef4f694e3b1aeda0 Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Tue, 20 Dec 2011 17:38:38 +0100
Subject: [PATCH 3/3] Fix bug #99 : unable to upgrade from 3.1 without creating
 a config.inc file manually

---
 .../module/console/systemUpgrade.class.php    | 45 ++++++++++++++++---
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/lib/classes/module/console/systemUpgrade.class.php b/lib/classes/module/console/systemUpgrade.class.php
index 529d15c3c7..22d62f2a66 100644
--- a/lib/classes/module/console/systemUpgrade.class.php
+++ b/lib/classes/module/console/systemUpgrade.class.php
@@ -36,9 +36,44 @@ class module_console_systemUpgrade extends Command
 
   public function execute(InputInterface $input, OutputInterface $output)
   {
-    if(!setup::is_installed())
+    if (!setup::is_installed())
     {
-      throw new RuntimeException('Phraseanet is not set up');
+
+      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';
@@ -59,12 +94,12 @@ class module_console_systemUpgrade extends Command
       {
         $output->write('<info>Upgrading...</info>', true);
         $appbox = appbox::get_instance();
-        
-        if(count(User_Adapter::get_wrong_email_users($appbox)) > 0)
+
+        if (count(User_Adapter::get_wrong_email_users($appbox)) > 0)
         {
           return $output->writeln(sprintf('<error>You have to fix your database before upgrade with the system:mailCheck command </error>'));
         }
-        
+
         $upgrader = new Setup_Upgrade($appbox);
         $advices = $appbox->forceUpgrade($upgrader);
       }