Fixed #53 - on ne passait pas d'id pour la création du répertoire d'images lors de...

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

diff --git a/view.php b/view.php
old mode 100755 (executable)
new mode 100644 (file)
index 75e6c3a..9ba6f62
--- a/view.php
+++ b/view.php
@@ -8,36 +8,29 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
-header('Content-type:text/html; charset=utf-8');
-
 include dirname(__FILE__).'/inc/config.php';
-require_once dirname(__FILE__).'/inc/rain.tpl.class.php';
-$db = new db(DB_PATH);
 
-if(isset($_GET['id']) && $_GET['id'] != '') {
+$id = (isset ($_GET['id'])) ? htmlspecialchars($_GET['id']) : '';
 
-    $sql    = "SELECT * FROM entries WHERE id=?";
-    $params = array(intval($_GET['id']));
+if(!empty($id)) {
 
-    # view article query
-    try
-    {
-        $query  = $db->getHandle()->prepare($sql);
-        $query->execute($params);
-        $entry = $query->fetchAll();
-    }
-    catch (Exception $e)
-    {
-        die('query error : '.$e->getMessage());
-    }
+    $entry = get_article($id);
 
     if ($entry != NULL) {
-        generate_page($entry[0]);
+        $tpl->assign('id', $entry[0]['id']);
+        $tpl->assign('url', $entry[0]['url']);
+        $tpl->assign('title', $entry[0]['title']);
+        $tpl->assign('content', $entry[0]['content']);
+        $tpl->assign('is_fav', $entry[0]['is_fav']);
+        $tpl->assign('is_read', $entry[0]['is_read']);
+        $tpl->assign('load_all_js', 0);
+        $tpl->assign('token', $_SESSION['token_poche']);
+        $tpl->draw('view');
     }
     else {
-        die('error in view call');
+        logm('error in view call : entry is NULL');
     }
 }
 else {
-    die('error in view call');
+    logm('error in view call : id is empty');
 }
\ No newline at end of file