aboutsummaryrefslogtreecommitdiffhomepage
path: root/install
diff options
context:
space:
mode:
Diffstat (limited to 'install')
-rwxr-xr-xinstall/poche.sqlitebin360448 -> 360448 bytes
-rw-r--r--install/update.php62
-rw-r--r--install/update_to_1beta3.php79
3 files changed, 109 insertions, 32 deletions
diff --git a/install/poche.sqlite b/install/poche.sqlite
index c268223d..7abf1f62 100755
--- a/install/poche.sqlite
+++ b/install/poche.sqlite
Binary files differ
diff --git a/install/update.php b/install/update.php
index 8c93af6d..1deaf7f3 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,9 +1,9 @@
1<?php 1<?php
2require_once dirname(__FILE__).'/../inc/poche/Tools.class.php'; 2require_once dirname(__FILE__).'/../inc/poche/Tools.class.php';
3include dirname(__FILE__).'/../inc/poche/define.inc.php'; 3include dirname(__FILE__).'/../inc/poche/define.inc.php';
4include dirname(__FILE__).'/../inc/poche/myconfig.inc.php';
4require_once __DIR__ . '/../inc/poche/Database.class.php'; 5require_once __DIR__ . '/../inc/poche/Database.class.php';
5$store = new Database(); 6$store = new Database();
6$old_salt = '464v54gLLw928uz4zUBqkRJeiPY68zCX';
7?> 7?>
8<!DOCTYPE html> 8<!DOCTYPE html>
9<!--[if lte IE 6]> <html class="no-js ie6 ie67 ie678" lang="en"> <![endif]--> 9<!--[if lte IE 6]> <html class="no-js ie6 ie67 ie678" lang="en"> <![endif]-->
@@ -16,25 +16,29 @@ $old_salt = '464v54gLLw928uz4zUBqkRJeiPY68zCX';
16 <title>updating poche</title> 16 <title>updating poche</title>
17 </head> 17 </head>
18 <body> 18 <body>
19 <h1>update poche to 1.0-beta3</h1> 19 <h1>update poche to 1.0-beta4</h1>
20 20
21 <h2>Changelog</h2> 21 <h2>Changelog</h2>
22 <p> 22 <ul>
23 <ul> 23 <li>enhancement: updating and installing poche are more easier</li>
24 <li>this awesome updating step</li> 24 <li>enhancement: poche now uses Full Text RSS to fetch content</li>
25 <li>error message when install folder exists</li> 25 <li>enhancement: css and twig files are more clean, thanks to NumEricR and nicofrand</li>
26 <li>more tests before installation (write access, etc.)</li> 26 <li>enhancement: updated german translation, thanks to HLFH</li>
27 <li>updated README to make installation easier</li> 27 <li>enhancement: add db/, cache/ and assets/ directories in versioning</li>
28 <li>german language thanks to HLFH</li> 28 <li>enhancement: display messages when error with import, thanks to EliasZ</li>
29 <li>spanish language thanks to Nitche</li> 29 <li>enhancement: poche compatibility test file</li>
30 <li>new file ./inc/poche/myconfig.inc.php created to store language and salt</li> 30 <li>enhancement: <a href="https://github.com/inthepoche/poche/issues/112">#112</a>: link with shaarli</li>
31 <li><a href="https://github.com/inthepoche/poche/issues/119">#119</a>: salt is now created when installing poche</li> 31 <li>enhancement: <a href="https://github.com/inthepoche/poche/issues/162">#162</a>: links to firefox / chrome / android apps in config screen</li>
32 <li><a href="https://github.com/inthepoche/poche/issues/130">#130</a>: robots.txt added</li> 32 <li>bug: encode url to share with twitter / email / shaarli</li>
33 <li><a href="https://github.com/inthepoche/poche/issues/136">#136</a>: error during readability import</li> 33 <li>bug: Add IPv4 url support (and others beginning by a digit)</li>
34 <li><a href="https://github.com/inthepoche/poche/issues/137">#137</a>: mixed content alert in https</li> 34 <li>bug: title page in article view was wrong</li>
35 <li><a href="https://github.com/inthepoche/poche/issues/138">#138</a>: change pattern to parse url with #</li> 35 <li>bug: <a href="https://github.com/inthepoche/poche/issues/148">#148</a>: use of undefined constant POCHE_VERSION</li>
36 </ul> 36 <li>bug: <a href="https://github.com/inthepoche/poche/issues/148">#149</a>: can't poche theguardian.com</li>
37 </p> 37 <li>bug: <a href="https://github.com/inthepoche/poche/issues/150">#150</a>: default title for untitled articles</li>
38 <li>bug: <a href="https://github.com/inthepoche/poche/issues/150">#151</a>: HTML entities in titles are encoded twice</li>
39 <li>bug: <a href="https://github.com/inthepoche/poche/issues/169">#169</a>: entries height with short description</li>
40 <li>bug: <a href="https://github.com/inthepoche/poche/issues/175">#175</a>: IP addresses do not appear in "view original"</li>
41 </ul>
38 <p>To update your poche, please fill the following fields.</p> 42 <p>To update your poche, please fill the following fields.</p>
39 <p> 43 <p>
40 <form name="update" method="post"> 44 <form name="update" method="post">
@@ -46,26 +50,20 @@ $old_salt = '464v54gLLw928uz4zUBqkRJeiPY68zCX';
46<?php 50<?php
47if (isset($_POST['go'])) { 51if (isset($_POST['go'])) {
48 if (!empty($_POST['login']) && !empty($_POST['password'])) { 52 if (!empty($_POST['login']) && !empty($_POST['password'])) {
49 $user = $store->login($_POST['login'], sha1($_POST['password'] . $_POST['login'] . $old_salt)); 53 $user = $store->login($_POST['login'], sha1($_POST['password'] . $_POST['login'] . SALT));
50 if ($user != array()) { 54 if ($user != array()) {
51 $new_salt = md5(time() . $_SERVER['SCRIPT_FILENAME'] . rand());
52 $myconfig_file = '../inc/poche/myconfig.inc.php'; 55 $myconfig_file = '../inc/poche/myconfig.inc.php';
53 if (!is_writable('../inc/poche/')) { 56 # just change version number in config file
54 die('You don\'t have write access to create ./inc/poche/myconfig.inc.php.'); 57
58 if (!is_writable('../inc/poche/myconfig.inc.php')) {
59 die('You don\'t have write access to open ./inc/poche/myconfig.inc.php.');
55 } 60 }
56 61
57 if (!file_exists($myconfig_file)) 62 if (file_exists($myconfig_file))
58 { 63 {
59 $fp = fopen($myconfig_file, 'w'); 64 $content = str_replace('1.0-beta3', '1.0-beta4', file_get_contents($myconfig_file));
60 65 file_put_contents($myconfig_file, $content);
61 fwrite($fp, '<?php'."\r\n");
62 fwrite($fp, "define ('POCHE_VERSION', '1.0-beta3');" . "\r\n");
63 fwrite($fp, "define ('SALT', '" . $new_salt . "');" . "\r\n");
64 fwrite($fp, "define ('LANG', 'en_EN.utf8');" . "\r\n");
65 fclose($fp);
66 } 66 }
67 # faire une mise à jour de la table users en prenant en compte le nouveau SALT généré
68 $store->updatePassword($user['id'], sha1($_POST['password'] . $_POST['login'] . $new_salt));
69?> 67?>
70 <p><span style="color: green;">your poche is up to date!</span></p> 68 <p><span style="color: green;">your poche is up to date!</span></p>
71 <p><span style="color: red;">don't forget to delete ./install/ folder after the update.</span></p> 69 <p><span style="color: red;">don't forget to delete ./install/ folder after the update.</span></p>
diff --git a/install/update_to_1beta3.php b/install/update_to_1beta3.php
new file mode 100644
index 00000000..8c93af6d
--- /dev/null
+++ b/install/update_to_1beta3.php
@@ -0,0 +1,79 @@
1<?php
2require_once dirname(__FILE__).'/../inc/poche/Tools.class.php';
3include dirname(__FILE__).'/../inc/poche/define.inc.php';
4require_once __DIR__ . '/../inc/poche/Database.class.php';
5$store = new Database();
6$old_salt = '464v54gLLw928uz4zUBqkRJeiPY68zCX';
7?>
8<!DOCTYPE html>
9<!--[if lte IE 6]> <html class="no-js ie6 ie67 ie678" lang="en"> <![endif]-->
10<!--[if lte IE 7]> <html class="no-js ie7 ie67 ie678" lang="en"> <![endif]-->
11<!--[if IE 8]> <html class="no-js ie8 ie678" lang="en"> <![endif]-->
12<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
13<html>
14 <head>
15 <meta charset="utf-8">
16 <title>updating poche</title>
17 </head>
18 <body>
19 <h1>update poche to 1.0-beta3</h1>
20
21 <h2>Changelog</h2>
22 <p>
23 <ul>
24 <li>this awesome updating step</li>
25 <li>error message when install folder exists</li>
26 <li>more tests before installation (write access, etc.)</li>
27 <li>updated README to make installation easier</li>
28 <li>german language thanks to HLFH</li>
29 <li>spanish language thanks to Nitche</li>
30 <li>new file ./inc/poche/myconfig.inc.php created to store language and salt</li>
31 <li><a href="https://github.com/inthepoche/poche/issues/119">#119</a>: salt is now created when installing poche</li>
32 <li><a href="https://github.com/inthepoche/poche/issues/130">#130</a>: robots.txt added</li>
33 <li><a href="https://github.com/inthepoche/poche/issues/136">#136</a>: error during readability import</li>
34 <li><a href="https://github.com/inthepoche/poche/issues/137">#137</a>: mixed content alert in https</li>
35 <li><a href="https://github.com/inthepoche/poche/issues/138">#138</a>: change pattern to parse url with #</li>
36 </ul>
37 </p>
38 <p>To update your poche, please fill the following fields.</p>
39 <p>
40 <form name="update" method="post">
41 <div><label for="login">login:</label> <input type="text" name="login" id="login" /></div>
42 <div><label for="password">password:</label> <input type="password" name="password" id="password" /></div>
43 <div><input type="hidden" name="go" value="ok" /><input type="submit" value="update" /></div>
44 </form>
45 </p>
46<?php
47if (isset($_POST['go'])) {
48 if (!empty($_POST['login']) && !empty($_POST['password'])) {
49 $user = $store->login($_POST['login'], sha1($_POST['password'] . $_POST['login'] . $old_salt));
50 if ($user != array()) {
51 $new_salt = md5(time() . $_SERVER['SCRIPT_FILENAME'] . rand());
52 $myconfig_file = '../inc/poche/myconfig.inc.php';
53 if (!is_writable('../inc/poche/')) {
54 die('You don\'t have write access to create ./inc/poche/myconfig.inc.php.');
55 }
56
57 if (!file_exists($myconfig_file))
58 {
59 $fp = fopen($myconfig_file, 'w');
60
61 fwrite($fp, '<?php'."\r\n");
62 fwrite($fp, "define ('POCHE_VERSION', '1.0-beta3');" . "\r\n");
63 fwrite($fp, "define ('SALT', '" . $new_salt . "');" . "\r\n");
64 fwrite($fp, "define ('LANG', 'en_EN.utf8');" . "\r\n");
65 fclose($fp);
66 }
67 # faire une mise à jour de la table users en prenant en compte le nouveau SALT généré
68 $store->updatePassword($user['id'], sha1($_POST['password'] . $_POST['login'] . $new_salt));
69?>
70 <p><span style="color: green;">your poche is up to date!</span></p>
71 <p><span style="color: red;">don't forget to delete ./install/ folder after the update.</span></p>
72 <p><a href="../">go back to your poche</a></p>
73<?php
74 }
75 }
76}
77?>
78 </body>
79</html> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 01:18:21 +0000