X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=5f43b7400c007887e94fe364bb66aabb78635499;hb=0269cd821311500acffed61edb1bc168d3fb5ec8;hp=d477d699d965cafa945d6c9e22233beecdb94d11;hpb=cf3180f6b8c552bbf7214d1ba72fbf1fc90ef861;p=github%2Fwallabag%2Fwallabag.git

diff --git a/index.php b/index.php
index d477d699..5f43b740 100755
--- a/index.php
+++ b/index.php
@@ -8,24 +8,63 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
-include dirname(__FILE__).'/inc/config.php';
+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');
+$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);
+}
+elseif (isset($_GET['logout'])) {
+    # see you soon !
+    $poche->logout();
+}
+elseif (isset($_GET['config'])) {
+    # Update password
+    $poche->updatePassword();
+}
+elseif (isset($_GET['import'])) {
+    $import = $poche->import($_GET['from']);
+}
+elseif (isset($_GET['export'])) {
+    $poche->export();
+}
 
-$action = (isset ($_REQUEST['action'])) ? htmlentities($_REQUEST['action']) : '';
-$view   = (isset ($_GET['view'])) ? htmlentities($_GET['view']) : 'index';
-$id     = (isset ($_REQUEST['id'])) ? htmlspecialchars($_REQUEST['id']) : '';
-$url    = (isset ($_GET['url'])) ? $_GET['url'] : '';
-$token    = (isset ($_POST['token'])) ? $_POST['token'] : '';
+# vars to send to templates
+$tpl_vars = array(
+    'referer' => $referer,
+    'view' => $view,
+    'poche_url' => Tools::getPocheUrl(),
+    'title' => _('poche, a read it later open source system'),
+    'token' => Session::getToken(),
+);
 
-if ($action != '') {
-    action_to_do($action, $id, $url, $token);
+if (Session::isLogged()) {
+    $poche->action($action, $url, $id);
+    $tpl_file = Tools::getTplFile($view);
+    $tpl_vars = array_merge($tpl_vars, $poche->displayView($view, $id));
+}
+else {
+    $tpl_file = 'login.twig';
 }
 
-$entries = display_view($view);
+# because messages can be added in $poche->action(), we have to add this entry now (we can add it before)
+$messages = $poche->messages->display('all', FALSE);
+$tpl_vars = array_merge($tpl_vars, array('messages' => $messages));
 
-$tpl->assign('title', 'poche, a read it later open source system');
-$tpl->assign('view', $view);
-$tpl->assign('poche_url', get_poche_url());
-$tpl->assign('entries', $entries);
-$tpl->assign('load_all_js', 1);
-$tpl->assign('token', $_SESSION['token_poche']);
-$tpl->draw('home');
\ No newline at end of file
+# display poche
+echo $poche->tpl->render($tpl_file, $tpl_vars);
\ No newline at end of file