From f0b9fc3f20ebde58d323e799cd7569c1b806a81d Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Fri, 27 Apr 2012 19:01:00 +0200
Subject: [PATCH] set phraseanet navigator to desactivate state by default,
 make exception handling nicer

---
 lib/classes/patch/370a3.class.php |  2 +-
 www/admin/databases.php           | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lib/classes/patch/370a3.class.php b/lib/classes/patch/370a3.class.php
index 19d6abcbfa..cff1005dcb 100644
--- a/lib/classes/patch/370a3.class.php
+++ b/lib/classes/patch/370a3.class.php
@@ -60,7 +60,7 @@ class patch_370a3 implements patchInterface
         } catch (\Exception_NotFound $e) {
             $client = \API_OAuth2_Application::create($appbox, null, \API_OAuth2_Application_Navigator::CLIENT_NAME);
 
-            $client->set_activated(true);
+            $client->set_activated(false);
             $client->set_grant_password(true);
             $client->set_website("http://www.phraseanet.com");
             $client->set_client_id(\API_OAuth2_Application_Navigator::CLIENT_ID);
diff --git a/www/admin/databases.php b/www/admin/databases.php
index 30f5623c41..cf3928cf85 100644
--- a/www/admin/databases.php
+++ b/www/admin/databases.php
@@ -71,10 +71,22 @@ phrasea::headers();
                             <?php echo _('N\'oubliez pas de redemarrer le planificateur de taches'); ?>
                         </div>
                         <?php
-                    } catch (\Exception $e) {
+                    } catch (\Exception_Setup_UpgradeAlreadyStarted $e) {
                         ?>
                         <div style="margin-top:10px;color:black;font-weight:bold;background-color:yellow;">
-                            <?php echo $e->getMessage(); ?>
+                            <?php echo _('The upgrade is already started'); ?>
+                        </div>
+                        <?php
+                    }catch(\Exception_Setup_FixBadEmailAddresses $e){
+                        ?>
+                        <div style="margin-top:10px;color:black;font-weight:bold;background-color:yellow;">
+                            <?php echo _('Please fix the database before starting'); ?>
+                        </div>
+                        <?php
+                    }catch(\Exception $e){
+                        ?>
+                        <div style="margin-top:10px;color:black;font-weight:bold;background-color:yellow;">
+                            <?php echo _('An error occured'); ?>
                         </div>
                         <?php
                     }