aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc
diff options
context:
space:
mode:
Diffstat (limited to 'inc')
-rw-r--r--inc/poche/Poche.class.php6
-rw-r--r--inc/poche/Tools.class.php4
2 files changed, 5 insertions, 5 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/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 52d0f2d5..8661ab6e 100644
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -238,7 +238,7 @@ class Tools
238 public static function createMyConfig() 238 public static function createMyConfig()
239 { 239 {
240 $myconfig_file = './inc/poche/myconfig.inc.php'; 240 $myconfig_file = './inc/poche/myconfig.inc.php';
241 241
242 if (!is_writable('./inc/poche/')) { 242 if (!is_writable('./inc/poche/')) {
243 self::logm('you don\'t have write access to create ./inc/poche/myconfig.inc.php'); 243 self::logm('you don\'t have write access to create ./inc/poche/myconfig.inc.php');
244 die('You don\'t have write access to create ./inc/poche/myconfig.inc.php.'); 244 die('You don\'t have write access to create ./inc/poche/myconfig.inc.php.');
@@ -248,7 +248,7 @@ class Tools
248 { 248 {
249 $fp = fopen($myconfig_file, 'w'); 249 $fp = fopen($myconfig_file, 'w');
250 fwrite($fp, '<?php'."\r\n"); 250 fwrite($fp, '<?php'."\r\n");
251 fwrite($fp, "define ('POCHE_VERSION', '1.0-beta3');" . "\r\n"); 251 fwrite($fp, "define ('POCHE_VERSION', '1.0-beta4');" . "\r\n");
252 fwrite($fp, "define ('SALT', '" . md5(time() . $_SERVER['SCRIPT_FILENAME'] . rand()) . "');" . "\r\n"); 252 fwrite($fp, "define ('SALT', '" . md5(time() . $_SERVER['SCRIPT_FILENAME'] . rand()) . "');" . "\r\n");
253 fwrite($fp, "define ('LANG', 'en_EN.utf8');" . "\r\n"); 253 fwrite($fp, "define ('LANG', 'en_EN.utf8');" . "\r\n");
254 fclose($fp); 254 fclose($fp);