aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-08-16 20:40:31 +0200
committerNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-08-16 20:40:31 +0200
commitabed0f212266895f67add983a478cd0eb88487a9 (patch)
tree48abe1cc81b33dddfd2a3c49ccce395194d43540
parent12c40987735de13be8361e76ac97b3999f5099f3 (diff)
downloadwallabag-abed0f212266895f67add983a478cd0eb88487a9.tar.gz
wallabag-abed0f212266895f67add983a478cd0eb88487a9.tar.zst
wallabag-abed0f212266895f67add983a478cd0eb88487a9.zip
some precisons in updating poche
-rw-r--r--inc/poche/Poche.class.php13
-rw-r--r--install/update.php1
2 files changed, 7 insertions, 7 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index cb865a2a..e0dc0d20 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -42,7 +42,11 @@ class Poche
42 $msg = ''; 42 $msg = '';
43 $allIsGood = TRUE; 43 $allIsGood = TRUE;
44 44
45 if (file_exists('./install/update.php') && !DEBUG_POCHE) { 45 if (!is_writable(CACHE)) {
46 Tools::logm('you don\'t have write access on cache directory');
47 die('You don\'t have write access on cache directory.');
48 }
49 else if (file_exists('./install/update.php') && !DEBUG_POCHE) {
46 $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.'; 50 $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.';
47 $allIsGood = FALSE; 51 $allIsGood = FALSE;
48 } 52 }
@@ -55,12 +59,7 @@ class Poche
55 $msg = 'You don\'t have write access on sqlite file.'; 59 $msg = 'You don\'t have write access on sqlite file.';
56 $allIsGood = FALSE; 60 $allIsGood = FALSE;
57 } 61 }
58 else if (!is_writable(CACHE)) { 62
59 Tools::logm('you don\'t have write access on cache directory');
60 $msg = 'You don\'t have write access on cache directory.';
61 $allIsGood = FALSE;
62 }
63
64 if (!$allIsGood) { 63 if (!$allIsGood) {
65 echo $this->tpl->render('error.twig', array( 64 echo $this->tpl->render('error.twig', array(
66 'msg' => $msg 65 'msg' => $msg
diff --git a/install/update.php b/install/update.php
index 392ab801..f628d1f1 100644
--- a/install/update.php
+++ b/install/update.php
@@ -35,6 +35,7 @@ $old_salt = '464v54gLLw928uz4zUBqkRJeiPY68zCX';
35 <li><a href="https://github.com/inthepoche/poche/issues/138">#138</a>: change pattern to parse url with #</li> 35 <li><a href="https://github.com/inthepoche/poche/issues/138">#138</a>: change pattern to parse url with #</li>
36 </ul> 36 </ul>
37 </p> 37 </p>
38 <p>To update your poche, please fill the following fields.</p>
38 <p> 39 <p>
39 <form name="update" method="post"> 40 <form name="update" method="post">
40 <div><label for="login">login:</label> <input type="text" name="login" id="login" /></div> 41 <div><label for="login">login:</label> <input type="text" name="login" id="login" /></div>