fixes with new session class

[github/wallabag/wallabag.git] / index.php

diff --git a/index.php b/index.php
index 40cadf885ae03459f4af2d95c397e701a5c9bd95..52a400a84a37b7147ba0bab0585011808e2b30ca 100644 (file)
--- a/index.php
+++ b/index.php
@@ -8,8 +8,15 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
+if (file_exists(__DIR__ . '/inc/poche/myconfig.inc.php')) {
+    require_once __DIR__ . '/inc/poche/myconfig.inc.php';
+}
+require_once './inc/poche/Tools.class.php';
+Tools::createMyConfig();
+
 include dirname(__FILE__).'/inc/poche/config.inc.php';
 
+# Parse GET & REFERER vars
 $referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
 $view = Tools::checkVar('view', 'home');
 $action = Tools::checkVar('action');
@@ -17,6 +24,7 @@ $id = Tools::checkVar('id');
 $_SESSION['sort'] = Tools::checkVar('sort', 'id');
 $url = new Url((isset ($_GET['url'])) ? $_GET['url'] : '');
 
+# poche actions
 if (isset($_GET['login'])) {
     # hello you
     $poche->login($referer);
@@ -30,13 +38,19 @@ elseif (isset($_GET['config'])) {
     $poche->updatePassword();
 }
 elseif (isset($_GET['import'])) {
-    $poche->import($_GET['from']);
+    $import = $poche->import($_GET['from']);
 }
 elseif (isset($_GET['export'])) {
     $poche->export();
 }
+elseif (isset($_GET['plainurl']) && !empty($_GET['plainurl'])) {
+    $plain_url = new Url(base64_encode($_GET['plainurl']));
+    $poche->action('add', $plain_url);
+}
 
+# vars to send to templates
 $tpl_vars = array(
+    'lang' => Tools::getDocLanguage($poche->user->getConfigValue('language')),
     'referer' => $referer,
     'view' => $view,
     'poche_url' => Tools::getPocheUrl(),
@@ -57,5 +71,5 @@ else {
 $messages = $poche->messages->display('all', FALSE);
 $tpl_vars = array_merge($tpl_vars, array('messages' => $messages));
 
-# Aaaaaaand action !
+# display poche
 echo $poche->tpl->render($tpl_file, $tpl_vars);
\ No newline at end of file