changement de la structure de la bdd sqlite : on stocke le contenu maintenant issue #17

diff --git a/db/poche.sqlite b/db/poche.sqlite
index 6847e9570a4a71fd08ae0c7f801d7f8762ee2a3a..2aee61f4b087d427b0e0f6ac0ad0c790b433d2dd 100755 (executable)
Binary files a/db/poche.sqlite and b/db/poche.sqlite differ

diff --git a/index.php b/index.php
index 27144de30ea88a6e9f14970ee2599da662d76888..7ae2fb6fea355de0a49df81c8d6202960a323e61 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -44,8 +44,17 @@ switch ($action)
             }
         }
 
-        $query = $db->getHandle()->prepare('INSERT INTO entries ( url, title ) VALUES (?, ?)');
-        $query->execute(array($url, $title));
+        try
+        {
+            # insert query
+            $query = $db->getHandle()->prepare('INSERT INTO entries ( url, title, content ) VALUES (?, ?, ?)');
+            $query->execute(array($url, $title, $r->articleContent->innerHTML));
+        }
+        catch (Exception $e)
+        {
+            error_log('insert query error : '.$e->getMessage());
+        }
+
         break;
     case 'delete':
         $sql_action     = "DELETE FROM entries WHERE id=?";
@@ -66,7 +75,7 @@ try
 }
 catch (Exception $e)
 {
-    die('query error : '.$e->getMessage());
+    die('action query error : '.$e->getMessage());
 }
 
 switch ($view)
@@ -95,7 +104,7 @@ try
 }
 catch (Exception $e)
 {
-    die('query error : '.$e->getMessage());
+    die('view query error : '.$e->getMessage());
 }
 
 ?>
@@ -136,7 +145,7 @@ catch (Exception $e)
                     <div id="entry-<?php echo $entry['id']; ?>" class="entrie mb2">
                         <span class="content">
                             <h2 class="h6-like">
-                                <a href="readityourself.php?url=<?php echo urlencode($entry['url']); ?>"><?php echo $entry['title']; ?>
+                                <a href="view.php?id=<?php echo $entry['id']; ?>"><?php echo $entry['title']; ?>
                             </h2>
                             <div class="tools">
                                 <a title="toggle mark as read" class="tool archive <?php echo ( ($entry['is_read'] == '0') ? 'archive-off' : '' ); ?>" onclick="toggle_archive(<?php echo $entry['id']; ?>)"><span></span></a>

diff --git a/process.php b/process.php
index ef258308914f685237c341d167de8b3ae869f714..0bd20e5deff71d6d184955f0fb283848675f0e69 100644 (file)
--- a/process.php
+++ b/process.php
@@ -14,7 +14,6 @@ $db = new db(DB_PATH);
 $action = (isset ($_GET['action'])) ? htmlspecialchars($_GET['action']) : '';
 $id     = (isset ($_GET['id'])) ? htmlspecialchars($_GET['id']) : '';
 
-
 switch ($action)
 {
     case 'toggle_fav' :

diff --git a/readityourself.php b/readityourself.php
deleted file mode 100755 (executable)
index 588baec..0000000
--- a/readityourself.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-header('Content-type:text/html; charset=utf-8');
-
-setlocale(LC_ALL, 'fr_FR');
-date_default_timezone_set('Europe/Paris');
-
-require_once dirname(__FILE__).'/inc/Readability.php';
-require_once dirname(__FILE__).'/inc/Encoding.php';
-require_once dirname(__FILE__).'/inc/rain.tpl.class.php';
-include dirname(__FILE__).'/inc/functions.php';
-
-if(isset($_GET['url']) && $_GET['url'] != null && trim($_GET['url']) != "") {
-       // get url link
-       if(strlen(trim($_GET['url'])) > 2048) {
-               echo "Error URL is too large !!";
-       } else {
-               $url = trim($_GET['url']);
-
-               // decode it
-               $url = html_entity_decode($url);
-
-               // if url use https protocol change it to http
-               if (!preg_match('!^https?://!i', $url)) $url = 'http://'.$url;
-
-               // convert page to utf-8
-               $html = Encoding::toUTF8(get_external_file($url,15));
-
-               if(isset($html) and strlen($html) > 0) {
-
-                       // send result to readability library
-                       $r = new Readability($html, $url);
-
-                       if($r->init()) {
-                               generate_page($url,$r->articleTitle->innerHTML,$r->articleContent->innerHTML);
-                       } else {
-                               // return data into an iframe
-                               echo "<iframe id='readabilityframe'>".$html."</iframe>";
-                       }
-               } else {
-                       echo "Error unable to get link : ".$url;
-               }
-       }
-}
\ No newline at end of file

diff --git a/view.php b/view.php
new file mode 100755 (executable)
index 0000000..aba1b7e
--- /dev/null
+++ b/view.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * poche, a read it later open source system
+ *
+ * @category   poche
+ * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
+ * @copyright  2013
+ * @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'] != '') {
+
+    $sql    = "SELECT * FROM entries WHERE id=?";
+    $params = array(intval($_GET['id']));
+
+    # view article query
+    try
+    {
+        $query  = $db->getHandle()->prepare($sql);
+        $query->execute($params);
+        $entry = $query->fetchAll();
+    }
+    catch (Exception $e)
+    {
+        die('query error : '.$e->getMessage());
+    }
+
+    generate_page($entry[0]['url'], $entry[0]['title'], $entry[0]['content']);
+}
\ No newline at end of file