suppression doublon du code pour la requête

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

diff --git a/index.php b/index.php
index 6f7c5fc01e697064a5bc2bfdf7130c4050788da2..8c695cd333c8cc5590a3503c8ddb0ceef7d2d68e 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -3,7 +3,7 @@
  * poche, a read it later open source system
  *
  * @category   poche
- * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
+ * @author     Nicolas Lœuillet <support@inthepoche.com>
  * @copyright  2013
  * @license    http://www.wtfpl.net/ see COPYING file
  */
@@ -14,46 +14,19 @@ $db = new db(DB_PATH);
 $action = (isset ($_GET['action'])) ? htmlspecialchars($_GET['action']) : '';
 $view   = (isset ($_GET['view'])) ? htmlspecialchars($_GET['view']) : '';
 $id     = (isset ($_GET['id'])) ? htmlspecialchars($_GET['id']) : '';
+$url    = (isset ($_GET['url'])) ? $_GET['url'] : '';
 
 switch ($action)
 {
     case 'add':
-        $url = (isset ($_GET['url'])) ? $_GET['url'] : '';
+
         if ($url == '')
             continue;
 
-        $url    = html_entity_decode(trim($url));
-
-        // We remove the annoying parameters added by FeedBurner and GoogleFeedProxy (?utm_source=...)
-        // from shaarli, by sebsauvage
-        $i=strpos($url,'&utm_source='); if ($i!==false) $url=substr($url,0,$i);
-        $i=strpos($url,'?utm_source='); if ($i!==false) $url=substr($url,0,$i);
-        $i=strpos($url,'#xtor=RSS-'); if ($i!==false) $url=substr($url,0,$i);
-
-        $title  = $url;
-        if (!preg_match('!^https?://!i', $url))
-            $url = 'http://' . $url;
-
-        $html = Encoding::toUTF8(get_external_file($url,15));
-        if (isset($html) and strlen($html) > 0)
-        {
-            $r = new Readability($html, $url);
-            if($r->init())
-            {
-                $title = $r->articleTitle->innerHTML;
-            }
-        }
+        $parametres_url = prepare_url($url);
 
-        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());
-        }
+        $sql_action = 'INSERT INTO entries ( url, title, content ) VALUES (?, ?, ?)';
+        $params_action  = array($url, $parametres_url['title'], $parametres_url['content']);
 
         break;
     case 'delete':
@@ -160,7 +133,7 @@ catch (Exception $e)
             </div>
         </div>
         <footer class="mr2 mt3 smaller">
-            <p>download poche on <a href="http://github.com/nicosomb/github">github</a><br />follow us on <a href="https://twitter.com/getpoche" title="follow us on twitter">twitter</a></p>
+            <p>powered by <a href="http://inthepoche.com">poche</a><br />follow us on <a href="https://twitter.com/getpoche" title="follow us on twitter">twitter</a></p>
         </footer>
         <script type="text/javascript" src="js/jquery-1.9.1.min.js"></script>
         <script type="text/javascript" src="js/jquery.masonry.min.js"></script>