diff options
-rw-r--r-- | inc/poche/Poche.class.php | 6 | ||||
-rw-r--r-- | install/update_to_1beta3.php (renamed from install/update.php) | 0 | ||||
-rw-r--r-- | tpl/error.twig | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index e0dc0d20..4832f816 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php | |||
@@ -47,16 +47,16 @@ class Poche | |||
47 | die('You don\'t have write access on cache directory.'); | 47 | die('You don\'t have write access on cache directory.'); |
48 | } | 48 | } |
49 | else if (file_exists('./install/update.php') && !DEBUG_POCHE) { | 49 | else if (file_exists('./install/update.php') && !DEBUG_POCHE) { |
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.'; | 50 | $msg = '<h1>setup</h1><p><strong>It\'s your first time here?</strong> Please copy /install/poche.sqlite in db folder. Then, delete install folder.<br /><strong>If you have already installed poche</strong>, an update is needed <a href="install/update.php">by clicking here</a>.</p>'; |
51 | $allIsGood = FALSE; | 51 | $allIsGood = FALSE; |
52 | } | 52 | } |
53 | else if (file_exists('./install') && !DEBUG_POCHE) { | 53 | else if (file_exists('./install') && !DEBUG_POCHE) { |
54 | $msg = 'If you want to update your poche, you just have to delete /install folder. <br />To install your poche with sqlite, copy /install/poche.sqlite in /db and delete the folder /install. you have to delete the /install folder before using poche.'; | 54 | $msg = '<h1>setup</h1><p><strong>If you want to update your poche</strong>, you just have to delete /install folder. <br /><strong>To install your poche with sqlite</strong>, copy /install/poche.sqlite in /db and delete the folder /install. you have to delete the /install folder before using poche.</p>'; |
55 | $allIsGood = FALSE; | 55 | $allIsGood = FALSE; |
56 | } | 56 | } |
57 | else if (STORAGE == 'sqlite' && !is_writable(STORAGE_SQLITE)) { | 57 | else if (STORAGE == 'sqlite' && !is_writable(STORAGE_SQLITE)) { |
58 | Tools::logm('you don\'t have write access on sqlite file'); | 58 | Tools::logm('you don\'t have write access on sqlite file'); |
59 | $msg = 'You don\'t have write access on sqlite file.'; | 59 | $msg = '<h1>error</h1><p>You don\'t have write access on sqlite file.</p>'; |
60 | $allIsGood = FALSE; | 60 | $allIsGood = FALSE; |
61 | } | 61 | } |
62 | 62 | ||
diff --git a/install/update.php b/install/update_to_1beta3.php index 8c93af6d..8c93af6d 100644 --- a/install/update.php +++ b/install/update_to_1beta3.php | |||
diff --git a/tpl/error.twig b/tpl/error.twig index 84c3bc1c..14c49925 100644 --- a/tpl/error.twig +++ b/tpl/error.twig | |||
@@ -1,7 +1,6 @@ | |||
1 | {% extends "layout.twig" %} | 1 | {% extends "layout.twig" %} |
2 | {% block title %}{% trans "error" %}{% endblock %} | 2 | {% block title %}{% trans "plop" %}{% endblock %} |
3 | {% block content %} | 3 | {% block content %} |
4 | <h1>error</h1> | 4 | {{ msg|raw }} |
5 | <p>{{ msg|raw }}</p> | ||
6 | <p>Don't forget <a href="http://inthepoche.com/?pages/Documentation">the documentation</a>.</p> | 5 | <p>Don't forget <a href="http://inthepoche.com/?pages/Documentation">the documentation</a>.</p> |
7 | {% endblock %} \ No newline at end of file | 6 | {% endblock %} \ No newline at end of file |