X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=472e0fabc20e3d34885367999e7258fd7a187567;hb=5d198e2b988e9bc44a6ecb4394600015c003003c;hp=96f28a72936368b47352e875eb08de6fd76cb7e1;hpb=f0133fe5f48386f09c3dc5d549a2204fdfda27bc;p=github%2Fwallabag%2Fwallabag.git

diff --git a/index.php b/index.php
old mode 100644
new mode 100755
index 96f28a72..472e0fab
--- a/index.php
+++ b/index.php
@@ -1,16 +1,20 @@
 <?php
 /**
- * poche, a read it later open source system
+ * wallabag, self hostable application allowing you to not miss any content anymore
  *
- * @category   poche
- * @author     Nicolas Lœuillet <support@inthepoche.com>
+ * @category   wallabag
+ * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
  * @copyright  2013
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
-define ('POCHE', '1.2.0');
+define ('POCHE', '1.7.0');
+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,14 +33,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 '<h1>Errors</h1><ol>';
         foreach ($notInstalledMessage as $message) {
             echo '<li>' . $message . '</li>';
@@ -62,20 +66,34 @@ 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'])) {
+    $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();
     }
     else {
-        $poche->generateFeeds($_GET['token'], $_GET['user_id'], $_GET['type']);
+        $tag_id = (isset($_GET['tag_id']) ? intval($_GET['tag_id']) : 0);
+        $poche->generateFeeds($_GET['token'], $_GET['user_id'], $tag_id, $_GET['type']);
     }
 }
 
@@ -97,9 +115,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)