From: Nicolas LÅ“uillet
Date: Fri, 23 Aug 2013 20:43:16 +0000 (+0200)
Subject: preparing to beta4
X-Git-Tag: 1.0-beta4~17
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=679b6b85ad1f8c9110334101a1568510ad15891b;p=github%2Fwallabag%2Fwallabag.git
preparing to beta4
---
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
public static function createMyConfig()
{
$myconfig_file = './inc/poche/myconfig.inc.php';
-
+
if (!is_writable('./inc/poche/')) {
self::logm('you don\'t have write access to create ./inc/poche/myconfig.inc.php');
die('You don\'t have write access to create ./inc/poche/myconfig.inc.php.');
@@ -248,7 +248,7 @@ class Tools
{
$fp = fopen($myconfig_file, 'w');
fwrite($fp, '
+
+
+
+
+
+
+
+
+ updating poche
+
+
+ update poche to 1.0-beta4
+
+ Changelog
+
+ - this awesome updating step
+ - error message when install folder exists
+ - more tests before installation (write access, etc.)
+ - updated README to make installation easier
+ - german language thanks to HLFH
+ - spanish language thanks to Nitche
+ - new file ./inc/poche/myconfig.inc.php created to store language and salt
+ - #119: salt is now created when installing poche
+ - #130: robots.txt added
+ - #136: error during readability import
+ - #137: mixed content alert in https
+ - #138: change pattern to parse url with #
+
+ To update your poche, please fill the following fields.
+
+
+
+login($_POST['login'], sha1($_POST['password'] . $_POST['login'] . SALT));
+ if ($user != array()) {
+ $myconfig_file = '../inc/poche/myconfig.inc.php';
+ # just change version number in config file
+
+ if (!is_writable('../inc/poche/myconfig.inc.php')) {
+ die('You don\'t have write access to open ./inc/poche/myconfig.inc.php.');
+ }
+
+ if (file_exists($myconfig_file))
+ {
+ $content = str_replace('1.0-beta3', '1.0-beta4', file_get_contents($myconfig_file));
+ file_put_contents($myconfig_file, $content);
+ }
+?>
+ your poche is up to date!
+ don't forget to delete ./install/ folder after the update.
+ go back to your poche
+
+
+
\ No newline at end of file