From abed0f212266895f67add983a478cd0eb88487a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Fri, 16 Aug 2013 20:40:31 +0200
Subject: [PATCH] some precisons in updating poche

---
 inc/poche/Poche.class.php | 13 ++++++-------
 install/update.php        |  1 +
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index cb865a2..e0dc0d2 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -42,7 +42,11 @@ class Poche
         $msg = '';
         $allIsGood = TRUE;
 
-        if (file_exists('./install/update.php') && !DEBUG_POCHE) {
+        if (!is_writable(CACHE)) {
+            Tools::logm('you don\'t have write access on cache directory');
+            die('You don\'t have write access on cache directory.');
+        }
+        else if (file_exists('./install/update.php') && !DEBUG_POCHE) {
             $msg = 'A poche update is needed. Please execute this update <a href="install/update.php">by clicking here</a>. If you have already do the update, please delete /install folder.';
             $allIsGood = FALSE;
         }
@@ -55,12 +59,7 @@ class Poche
             $msg = 'You don\'t have write access on sqlite file.';
             $allIsGood = FALSE;
         }
-        else if (!is_writable(CACHE)) {
-            Tools::logm('you don\'t have write access on cache directory');
-            $msg = 'You don\'t have write access on cache directory.';
-            $allIsGood = FALSE;
-        }
-
+        
         if (!$allIsGood) {
             echo $this->tpl->render('error.twig', array(
                 'msg' => $msg
diff --git a/install/update.php b/install/update.php
index 392ab80..f628d1f 100644
--- a/install/update.php
+++ b/install/update.php
@@ -35,6 +35,7 @@ $old_salt = '464v54gLLw928uz4zUBqkRJeiPY68zCX';
                 <li><a href="https://github.com/inthepoche/poche/issues/138">#138</a>: change pattern to parse url with #</li>
             </ul>
         </p>
+        <p>To update your poche, please fill the following fields.</p>
         <p>
         <form name="update" method="post">
             <div><label for="login">login:</label> <input type="text" name="login" id="login" /></div>