* @license http://www.wtfpl.net/ see COPYING file
*/
-define ('POCHE', '1.5.3');
+define ('POCHE', '1.6.0');
require 'check_setup.php';
require_once 'inc/poche/global.inc.php';
# Start session
Session::$sessionName = 'poche';
-if ( !isset($_GET['login']) ) {
- Session::init();
-}
+Session::init();
# Start Poche
$poche = new Poche();
if (! empty($notInstalledMessage)) {
if (! Poche::$canRenderTemplates || ! Poche::$configFileAvailable) {
- # We cannot use Twig to display the error message
+ # We cannot use Twig to display the error message
echo '<h1>Errors</h1><ol>';
foreach ($notInstalledMessage as $message) {
echo '<li>' . $message . '</li>';
# Update password
$poche->updatePassword();
} elseif (isset($_GET['import'])) {
- $import = $poche->import($_GET['from']);
+ $import = $poche->import();
+ $tpl_vars = array_merge($tpl_vars, $import);
} elseif (isset($_GET['download'])) {
Tools::download_db();
} elseif (isset($_GET['empty-cache'])) {
} else {
$tpl_file = Tools::getTplFile('login');
$tpl_vars['http_auth'] = 0;
+ Session::logout();
}
# because messages can be added in $poche->action(), we have to add this entry now (we can add it before)