X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=9113f1932255ed71657fa24b8559f2be8c3d6bc3;hb=c8265d95b0247c146793c9804198a9ed45b6f846;hp=7d462228e7d5be446d3b76f6014dbd97c41ae075;hpb=72c20a52978f31b84ffc817894f9f85f4a8506ee;p=github%2Fwallabag%2Fwallabag.git

diff --git a/index.php b/index.php
index 7d462228..9113f193 100644
--- a/index.php
+++ b/index.php
@@ -1,14 +1,14 @@
 <?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.4.0');
 require_once 'inc/poche/global.inc.php';
 session_start(); 
 
@@ -64,6 +64,8 @@ if (isset($_GET['login'])) {
     $poche->updatePassword();
 } elseif (isset($_GET['import'])) {
     $import = $poche->import($_GET['from']);
+} elseif (isset($_GET['download'])) {
+    Tools::download_db();;
 } elseif (isset($_GET['export'])) {
     $poche->export();
 } elseif (isset($_GET['updatetheme'])) {
@@ -71,11 +73,12 @@ if (isset($_GET['login'])) {
 } elseif (isset($_GET['updatelanguage'])) {
     $poche->updateLanguage();
 } elseif (isset($_GET['feed'])) {
-    if ($_GET['action'] == 'generate') {
+    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,6 +100,15 @@ 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;