+++ /dev/null
-language: php
-
-php:
- - 5.4
-
-branches:
- only:
- - dev
-
-before_script:
- - composer install
-
-notifications:
- email:
- - nicolas.loeuillet@gmail.com
\ No newline at end of file
# TODO
-pouvoir annuler la suppression
-conventions codage ? phing ? vérifier error_log qui trainent
-phpDocumentor
-minifier css
-revoir tous les css
-barre fixe d'admin sur la page d'un billet ?
-revoir export (export vers pocket &cie ? )
-raccourcis clavier
-date d'ajout d'un lien
\ No newline at end of file
+* pouvoir annuler la suppression
+* conventions codage ? phing ? vérifier error_log qui trainent
+* phpDocumentor
+* minifier css
+* barre fixe d'admin sur la page d'un billet ?
+* revoir export (export vers pocket &cie ? )
+* raccourcis clavier
\ No newline at end of file
die('You don\'t have write access on cache directory.');
}
else if (file_exists('./install/update.php') && !DEBUG_POCHE) {
- $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.';
+ $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>';
$allIsGood = FALSE;
}
else if (file_exists('./install') && !DEBUG_POCHE) {
- $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.';
+ $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>';
$allIsGood = FALSE;
}
else if (STORAGE == 'sqlite' && !is_writable(STORAGE_SQLITE)) {
Tools::logm('you don\'t have write access on sqlite file');
- $msg = 'You don\'t have write access on sqlite file.';
+ $msg = '<h1>error</h1><p>You don\'t have write access on sqlite file.</p>';
$allIsGood = FALSE;
}
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.');
{
$fp = fopen($myconfig_file, 'w');
fwrite($fp, '<?php'."\r\n");
- fwrite($fp, "define ('POCHE_VERSION', '1.0-beta3');" . "\r\n");
+ fwrite($fp, "define ('POCHE_VERSION', '1.0-beta4');" . "\r\n");
fwrite($fp, "define ('SALT', '" . md5(time() . $_SERVER['SCRIPT_FILENAME'] . rand()) . "');" . "\r\n");
fwrite($fp, "define ('LANG', 'en_EN.utf8');" . "\r\n");
fclose($fp);
<?php
require_once dirname(__FILE__).'/../inc/poche/Tools.class.php';
include dirname(__FILE__).'/../inc/poche/define.inc.php';
+include dirname(__FILE__).'/../inc/poche/myconfig.inc.php';
require_once __DIR__ . '/../inc/poche/Database.class.php';
$store = new Database();
-$old_salt = '464v54gLLw928uz4zUBqkRJeiPY68zCX';
?>
<!DOCTYPE html>
<!--[if lte IE 6]> <html class="no-js ie6 ie67 ie678" lang="en"> <![endif]-->
<title>updating poche</title>
</head>
<body>
- <h1>update poche to 1.0-beta3</h1>
+ <h1>update poche to 1.0-beta4</h1>
<h2>Changelog</h2>
- <p>
- <ul>
- <li>this awesome updating step</li>
- <li>error message when install folder exists</li>
- <li>more tests before installation (write access, etc.)</li>
- <li>updated README to make installation easier</li>
- <li>german language thanks to HLFH</li>
- <li>spanish language thanks to Nitche</li>
- <li>new file ./inc/poche/myconfig.inc.php created to store language and salt</li>
- <li><a href="https://github.com/inthepoche/poche/issues/119">#119</a>: salt is now created when installing poche</li>
- <li><a href="https://github.com/inthepoche/poche/issues/130">#130</a>: robots.txt added</li>
- <li><a href="https://github.com/inthepoche/poche/issues/136">#136</a>: error during readability import</li>
- <li><a href="https://github.com/inthepoche/poche/issues/137">#137</a>: mixed content alert in https</li>
- <li><a href="https://github.com/inthepoche/poche/issues/138">#138</a>: change pattern to parse url with #</li>
- </ul>
- </p>
+ <ul>
+ <li>this awesome updating step</li>
+ <li>error message when install folder exists</li>
+ <li>more tests before installation (write access, etc.)</li>
+ <li>updated README to make installation easier</li>
+ <li>german language thanks to HLFH</li>
+ <li>spanish language thanks to Nitche</li>
+ <li>new file ./inc/poche/myconfig.inc.php created to store language and salt</li>
+ <li><a href="https://github.com/inthepoche/poche/issues/119">#119</a>: salt is now created when installing poche</li>
+ <li><a href="https://github.com/inthepoche/poche/issues/130">#130</a>: robots.txt added</li>
+ <li><a href="https://github.com/inthepoche/poche/issues/136">#136</a>: error during readability import</li>
+ <li><a href="https://github.com/inthepoche/poche/issues/137">#137</a>: mixed content alert in https</li>
+ <li><a href="https://github.com/inthepoche/poche/issues/138">#138</a>: change pattern to parse url with #</li>
+ </ul>
<p>To update your poche, please fill the following fields.</p>
<p>
<form name="update" method="post">
<?php
if (isset($_POST['go'])) {
if (!empty($_POST['login']) && !empty($_POST['password'])) {
- $user = $store->login($_POST['login'], sha1($_POST['password'] . $_POST['login'] . $old_salt));
+ $user = $store->login($_POST['login'], sha1($_POST['password'] . $_POST['login'] . SALT));
if ($user != array()) {
- $new_salt = md5(time() . $_SERVER['SCRIPT_FILENAME'] . rand());
$myconfig_file = '../inc/poche/myconfig.inc.php';
- if (!is_writable('../inc/poche/')) {
- die('You don\'t have write access to create ./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))
+ if (file_exists($myconfig_file))
{
- $fp = fopen($myconfig_file, 'w');
-
- fwrite($fp, '<?php'."\r\n");
- fwrite($fp, "define ('POCHE_VERSION', '1.0-beta3');" . "\r\n");
- fwrite($fp, "define ('SALT', '" . $new_salt . "');" . "\r\n");
- fwrite($fp, "define ('LANG', 'en_EN.utf8');" . "\r\n");
- fclose($fp);
+ $content = str_replace('1.0-beta3', '1.0-beta4', file_get_contents($myconfig_file));
+ file_put_contents($myconfig_file, $content);
}
- # faire une mise à jour de la table users en prenant en compte le nouveau SALT généré
- $store->updatePassword($user['id'], sha1($_POST['password'] . $_POST['login'] . $new_salt));
?>
<p><span style="color: green;">your poche is up to date!</span></p>
<p><span style="color: red;">don't forget to delete ./install/ folder after the update.</span></p>
--- /dev/null
+<?php
+require_once dirname(__FILE__).'/../inc/poche/Tools.class.php';
+include dirname(__FILE__).'/../inc/poche/define.inc.php';
+require_once __DIR__ . '/../inc/poche/Database.class.php';
+$store = new Database();
+$old_salt = '464v54gLLw928uz4zUBqkRJeiPY68zCX';
+?>
+<!DOCTYPE html>
+<!--[if lte IE 6]> <html class="no-js ie6 ie67 ie678" lang="en"> <![endif]-->
+<!--[if lte IE 7]> <html class="no-js ie7 ie67 ie678" lang="en"> <![endif]-->
+<!--[if IE 8]> <html class="no-js ie8 ie678" lang="en"> <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>updating poche</title>
+ </head>
+ <body>
+ <h1>update poche to 1.0-beta3</h1>
+
+ <h2>Changelog</h2>
+ <p>
+ <ul>
+ <li>this awesome updating step</li>
+ <li>error message when install folder exists</li>
+ <li>more tests before installation (write access, etc.)</li>
+ <li>updated README to make installation easier</li>
+ <li>german language thanks to HLFH</li>
+ <li>spanish language thanks to Nitche</li>
+ <li>new file ./inc/poche/myconfig.inc.php created to store language and salt</li>
+ <li><a href="https://github.com/inthepoche/poche/issues/119">#119</a>: salt is now created when installing poche</li>
+ <li><a href="https://github.com/inthepoche/poche/issues/130">#130</a>: robots.txt added</li>
+ <li><a href="https://github.com/inthepoche/poche/issues/136">#136</a>: error during readability import</li>
+ <li><a href="https://github.com/inthepoche/poche/issues/137">#137</a>: mixed content alert in https</li>
+ <li><a href="https://github.com/inthepoche/poche/issues/138">#138</a>: change pattern to parse url with #</li>
+ </ul>
+ </p>
+ <p>To update your poche, please fill the following fields.</p>
+ <p>
+ <form name="update" method="post">
+ <div><label for="login">login:</label> <input type="text" name="login" id="login" /></div>
+ <div><label for="password">password:</label> <input type="password" name="password" id="password" /></div>
+ <div><input type="hidden" name="go" value="ok" /><input type="submit" value="update" /></div>
+ </form>
+ </p>
+<?php
+if (isset($_POST['go'])) {
+ if (!empty($_POST['login']) && !empty($_POST['password'])) {
+ $user = $store->login($_POST['login'], sha1($_POST['password'] . $_POST['login'] . $old_salt));
+ if ($user != array()) {
+ $new_salt = md5(time() . $_SERVER['SCRIPT_FILENAME'] . rand());
+ $myconfig_file = '../inc/poche/myconfig.inc.php';
+ if (!is_writable('../inc/poche/')) {
+ die('You don\'t have write access to create ./inc/poche/myconfig.inc.php.');
+ }
+
+ if (!file_exists($myconfig_file))
+ {
+ $fp = fopen($myconfig_file, 'w');
+
+ fwrite($fp, '<?php'."\r\n");
+ fwrite($fp, "define ('POCHE_VERSION', '1.0-beta3');" . "\r\n");
+ fwrite($fp, "define ('SALT', '" . $new_salt . "');" . "\r\n");
+ fwrite($fp, "define ('LANG', 'en_EN.utf8');" . "\r\n");
+ fclose($fp);
+ }
+ # faire une mise à jour de la table users en prenant en compte le nouveau SALT généré
+ $store->updatePassword($user['id'], sha1($_POST['password'] . $_POST['login'] . $new_salt));
+?>
+ <p><span style="color: green;">your poche is up to date!</span></p>
+ <p><span style="color: red;">don't forget to delete ./install/ folder after the update.</span></p>
+ <p><a href="../">go back to your poche</a></p>
+<?php
+ }
+ }
+}
+?>
+ </body>
+</html>
\ No newline at end of file
{% block content %}
<h2>{% trans "Poching a link" %}</h2>
<p>You can poche a link by several methods: (<a href="http://www.inthepoche.com/?pages/Documentation" title="{% trans "read the documentation" %}">?</a>)</p>
-
<li>firefox: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.xpi" title="download the firefox extension">download the extension</a></li>
-
<li>chrome: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.crx" title="download the chrome extension">download the extension</a></li>
-
<li>android: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/Poche.apk" title="download the application">download the application</a></li>
-
<li>bookmarklet: drag & drop this link to your bookmarks bar <a ondragend="this.click();" style="cursor: move; border: 1px dashed grey; background: white; padding: 5px;" title="i am a bookmarklet, use me !" href="javascript:if(top['bookmarklet-url@inthepoche.com']){top['bookmarklet-url@inthepoche.com'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "poche it!" %}</a></li>
- </ul>
+ <ul>
+ <li>firefox: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.xpi" title="download the firefox extension">download the extension</a></li>
+ <li>chrome: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.crx" title="download the chrome extension">download the extension</a></li>
+ <li>android: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/Poche.apk" title="download the application">download the application</a></li>
+ <li>bookmarklet: drag & drop this link to your bookmarks bar <a ondragend="this.click();" style="cursor: move; border: 1px dashed grey; background: white; padding: 5px;" title="i am a bookmarklet, use me !" href="javascript:if(top['bookmarklet-url@inthepoche.com']){top['bookmarklet-url@inthepoche.com'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "poche it!" %}</a></li>
+ </ul>
<h2>{% trans "Updating poche" %}</h2>
<ul>
<p>{% trans "Please execute the import script locally, it can take a very long time." %}</p>
<p>{% trans "More infos in the official doc:" %} <a href="http://inthepoche.com/?pages/Documentation">inthepoche.com</a></p>
<ul>
-
<li><a href="./?import&from=pocket">{% trans "import from Pocket" %}</a> (you must have a "ril_export.html" file on your server)</li>
-
<li><a href="./?import&from=readability">{% trans "import from Readability" %}</a> (you must have a "readability" file on your server)</li>
-
<li><a href="./?import&from=instapaper">{% trans "import from Instapaper" %}</a> (you must have a "instapaper-export.html" file on your server)</li>
+ <li><a href="./?import&from=pocket">{% trans "import from Pocket" %}</a> (you must have a "ril_export.html" file on your server)</li>
+ <li><a href="./?import&from=readability">{% trans "import from Readability" %}</a> (you must have a "readability" file on your server)</li>
+ <li><a href="./?import&from=instapaper">{% trans "import from Instapaper" %}</a> (you must have a "instapaper-export.html" file on your server)</li>
</ul>
<h2>{% trans "Export your poche datas" %}</h2>
{% extends "layout.twig" %}
-{% block title %}{% trans "error" %}{% endblock %}
+{% block title %}{% trans "plop" %}{% endblock %}
{% block content %}
- <h1>error</h1>
- <p>{{ msg|raw }}</p>
+ {{ msg|raw }}
<p>Don't forget <a href="http://inthepoche.com/?pages/Documentation">the documentation</a>.</p>
{% endblock %}
\ No newline at end of file
<head>
<meta name="viewport" content="initial-scale=1.0">
<meta charset="utf-8">
+ <!--[if IE]>
<meta http-equiv="X-UA-Compatible" content="IE=10">
+ <![endif]-->
<title>{% block title %}{% endblock %} - poche</title>
{% include '_head.twig' %}
{% include '_bookmarklet.twig' %}
projects / github / wallabag / wallabag.git / commitdiff
