suppression doublon du code pour la requête

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

diff --git a/index.php b/index.php
index cf7ea3e28f818f05d9213302a2ac4f728eb827d4..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,38 +14,20 @@ $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);
+        $parametres_url = prepare_url($url);
 
-        $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;
-            }
-        }
+        $sql_action = 'INSERT INTO entries ( url, title, content ) VALUES (?, ?, ?)';
+        $params_action  = array($url, $parametres_url['title'], $parametres_url['content']);
 
-        $query = $db->getHandle()->prepare('INSERT INTO entries ( url, title ) VALUES (?, ?)');
-        $query->execute(array($url, $title));
         break;
     case 'delete':
         $sql_action     = "DELETE FROM entries WHERE id=?";
@@ -66,7 +48,7 @@ try
 }
 catch (Exception $e)
 {
-    die('query error : '.$e->getMessage());
+    die('action query error : '.$e->getMessage());
 }
 
 switch ($view)
@@ -95,7 +77,7 @@ try
 }
 catch (Exception $e)
 {
-    die('query error : '.$e->getMessage());
+    die('view query error : '.$e->getMessage());
 }
 
 ?>
@@ -129,33 +111,48 @@ catch (Exception $e)
                 <li><a style="cursor: move" title="i am a bookmarklet, use me !" href="javascript:(function(){var%20url%20=%20location.href;var%20title%20=%20document.title%20||%20url;window.open('<?php echo url()?>?action=add&url='%20+%20encodeURIComponent(url),'_self');})();">poche it !</a></li>
             </ul>
             <div id="content">
-                <ul id="entries">
                 <?php
                 foreach ($entries as $entry)
                 {
                     ?>
-                    <li id="entry-<?php echo $entry['id']; ?>" class="entrie mb2">
+                    <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>
+                                <a title="toggle mark as read" class="tool archive <?php echo ( ($entry['is_read'] == '0') ? 'archive-off' : '' ); ?>" onclick="toggle_archive(this, <?php echo $entry['id']; ?>)"><span></span></a>
                                 <a title="toggle favorite" class="tool fav <?php echo ( ($entry['is_fav'] == '0') ? 'fav-off' : '' ); ?>" onclick="toggle_favorite(this, <?php echo $entry['id']; ?>)"><span></span></a>
                                 <a href="?action=delete&id=<?php echo $entry['id']; ?>" title="toggle delete" onclick="return confirm('Are you sure?')" class="tool delete"><span></span></a>
                             </div>
                         </span>
-                    </li>
+                    </div>
                 <?php
                 }
                 ?>
-                </ul>
             </div>
         </div>
         <footer class="mr2 mt3 smaller">
-            <p><a href="https://twitter.com/getpoche" title="follow us on twitter">Follow @getpoche on 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>
         <script type="text/javascript" src="js/poche.js"></script>
+        <script type="text/javascript">
+            $( window ).load( function()
+            {
+                var columns    = 3,
+                    setColumns = function() { columns = $( window ).width() > 640 ? 3 : $( window ).width() > 320 ? 2 : 1; };
+
+                setColumns();
+                $( window ).resize( setColumns );
+
+                $( '#content' ).masonry(
+                {
+                    itemSelector: '.entrie',
+                    columnWidth:  function( containerWidth ) { return containerWidth / columns; }
+                });
+            });
+        </script>
     </body>
 </html>