X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=fb13f38d499f3a271083a93e2aff26994991c232;hb=08718c01e4b8b35fe75b1e04534e028dd26c8c53;hp=145da772f5ca28238e993dc79340518e2822d583;hpb=05d6dd487ceaf8c00510ebe5e0e762fcc11df691;p=github%2Fwallabag%2Fwallabag.git diff --git a/index.php b/index.php index 145da772..fb13f38d 100644 --- a/index.php +++ b/index.php @@ -1,16 +1,20 @@ + * @category wallabag + * @author Nicolas Lœuillet * @copyright 2013 * @license http://www.wtfpl.net/ see COPYING file */ -define ('POCHE', '1.2.0'); +define ('POCHE', '1.5.3'); +require 'check_setup.php'; require_once 'inc/poche/global.inc.php'; -session_start(); + +# Start session +Session::$sessionName = 'poche'; +Session::init(); # Start Poche $poche = new Poche(); @@ -29,7 +33,7 @@ $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() ); @@ -65,13 +69,17 @@ if (isset($_GET['login'])) { } elseif (isset($_GET['import'])) { $import = $poche->import($_GET['from']); } elseif (isset($_GET['download'])) { - Tools::download_db();; + Tools::download_db(); +} elseif (isset($_GET['empty-cache'])) { + $poche->emptyCache(); } elseif (isset($_GET['export'])) { $poche->export(); } elseif (isset($_GET['updatetheme'])) { $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(); @@ -100,9 +108,19 @@ if (Session::isLogged()) { $tpl_file = Tools::getTplFile('login'); $tpl_vars['http_auth'] = 1; } +} elseif(isset($_SERVER['REMOTE_USER'])) { + if($poche->store->userExists($_SERVER['REMOTE_USER'])) { + $poche->login($referer); + } else { + $poche->messages->add('e', _('login failed: user doesn\'t exist')); + Tools::logm('user doesn\'t exist'); + $tpl_file = Tools::getTplFile('login'); + $tpl_vars['http_auth'] = 1; + } } 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)