X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=afacdddc00e28ba07303e99fd409d9a0dd103637;hb=a13ff95777bfca0b677ec17faa5aa4ffafc9ad1c;hp=7ded3bdbc09862917b21ca09f3774484474e6a18;hpb=60ca369cd328f4eae31005c547b9419a5ab33324;p=github%2Fwallabag%2Fwallabag.git
diff --git a/index.php b/index.php
old mode 100644
new mode 100755
index 7ded3bdb..afacdddc
--- a/index.php
+++ b/index.php
@@ -8,10 +8,18 @@
* @license http://www.wtfpl.net/ see COPYING file
*/
-define ('POCHE', '1.5.0');
+define ('POCHE', '1.7.0');
require 'check_setup.php';
require_once 'inc/poche/global.inc.php';
-session_start();
+
+# Set error reporting level
+if (defined('ERROR_REPORTING')) {
+ error_reporting(ERROR_REPORTING);
+}
+
+# Start session
+Session::$sessionName = 'poche';
+Session::init();
# Start Poche
$poche = new Poche();
@@ -30,14 +38,14 @@ $tpl_vars = array(
'referer' => $referer,
'view' => $view,
'poche_url' => Tools::getPocheUrl(),
- 'title' => _('poche, a read it later open source system'),
+ 'title' => _('wallabag, a read it later open source system'),
'token' => Session::getToken(),
'theme' => $poche->getTheme()
);
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 '
Errors
';
foreach ($notInstalledMessage as $message) {
echo '- ' . $message . '
';
@@ -63,8 +71,15 @@ if (isset($_GET['login'])) {
} elseif (isset($_GET['config'])) {
# Update password
$poche->updatePassword();
+} elseif (isset($_GET['newuser'])) {
+ $poche->createNewUser();
+} elseif (isset($_GET['deluser'])) {
+ $poche->deleteUser();
+} elseif (isset($_GET['epub'])) {
+ $poche->createEpub();
} 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'])) {
@@ -75,13 +90,15 @@ if (isset($_GET['login'])) {
$poche->updateTheme();
} elseif (isset($_GET['updatelanguage'])) {
$poche->updateLanguage();
+} elseif (isset($_GET['uploadfile'])) {
+ $poche->uploadFile();
} elseif (isset($_GET['feed'])) {
if (isset($_GET['action']) && $_GET['action'] == 'generate') {
$poche->generateToken();
}
else {
$tag_id = (isset($_GET['tag_id']) ? intval($_GET['tag_id']) : 0);
- $poche->generateFeeds($_GET['token'], $_GET['user_id'], $tag_id, $_GET['type']);
+ $poche->generateFeeds($_GET['token'], filter_var($_GET['user_id'],FILTER_SANITIZE_NUMBER_INT), $tag_id, $_GET['type']);
}
}
@@ -115,6 +132,7 @@ if (Session::isLogged()) {
} 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)