* @license http://www.wtfpl.net/ see COPYING file
*/
-/**
- * TODO
- * gestion des erreurs sqlite (duplicate tout ça)
- * gérer si url vide
- * traiter les variables passées en get
- * récupérer le titre de la page pochée (cf readityourself.php)
- * actions archive, fav et delete à traiter
- * bookmarklet
- * améliorer présentation des liens
- * améliorer présentation d'un article
- * aligner verticalement les icones d'action
- * afficher liens mis en favoris et archivés
- * tri des liens
- */
-require_once dirname(__FILE__).'/inc/Readability.php';
-require_once dirname(__FILE__).'/inc/Encoding.php';
-include dirname(__FILE__).'/inc/functions.php';
-
-try
-{
- $db_handle = new PDO('sqlite:db/poche.sqlite');
- $db_handle->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-}
-catch (Exception $e)
-{
- die('database error : '.$e->getMessage());
-}
+include dirname(__FILE__).'/inc/config.php';
+$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']) : '';
+$view = (isset ($_GET['view'])) ? htmlspecialchars($_GET['view']) : '';
+$id = (isset ($_GET['id'])) ? htmlspecialchars($_GET['id']) : '';
-switch ($action) {
+switch ($action)
+{
case 'add':
$url = (isset ($_GET['url'])) ? $_GET['url'] : '';
- $url = html_entity_decode(trim($url));
- $title = $url;
- // if url use https protocol change it to http
- if (!preg_match('!^https?://!i', $url)) $url = 'http://'.$url;
- // convert page to utf-8
+ 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) {
- // send result to readability library
+ if (isset($html) and strlen($html) > 0)
+ {
$r = new Readability($html, $url);
- if($r->init()) {
+ if($r->init())
+ {
$title = $r->articleTitle->innerHTML;
}
}
- $query = $db_handle->prepare('INSERT INTO entries ( url, title ) VALUES (?, ?)');
+ $query = $db->getHandle()->prepare('INSERT INTO entries ( url, title ) VALUES (?, ?)');
$query->execute(array($url, $title));
break;
- case 'toggle_fav' :
- $sql_action = "UPDATE entries SET is_fav=~is_fav WHERE id=?";
- $params_action = array($id);
- break;
- case 'toggle_archive' :
- $sql_action = "UPDATE entries SET is_read=~is_read WHERE id=?";
- $params_action = array($id);
- break;
case 'delete':
- $sql_action = "DELETE FROM entries WHERE id=?";
- $params_action = array($id);
+ $sql_action = "DELETE FROM entries WHERE id=?";
+ $params_action = array($id);
break;
default:
break;
try
{
# action query
- if (isset($sql_action)) {
- $query = $db_handle->prepare($sql_action);
+ if (isset($sql_action))
+ {
+ $query = $db->getHandle()->prepare($sql_action);
$query->execute($params_action);
}
}
die('query error : '.$e->getMessage());
}
-switch ($view) {
+switch ($view)
+{
case 'archive':
- $sql = "SELECT * FROM entries WHERE is_read=?";
+ $sql = "SELECT * FROM entries WHERE is_read=? ORDER BY id desc";
$params = array(-1);
break;
case 'fav' :
- $sql = "SELECT * FROM entries WHERE is_fav=?";
+ $sql = "SELECT * FROM entries WHERE is_fav=? ORDER BY id desc";
$params = array(-1);
break;
default:
- $sql = "SELECT * FROM entries WHERE is_read=?";
+ $sql = "SELECT * FROM entries WHERE is_read=? ORDER BY id desc";
$params = array(0);
+ $view = 'index';
break;
}
# view query
try
{
- $query = $db_handle->prepare($sql);
+ $query = $db->getHandle()->prepare($sql);
$query->execute($params);
$entries = $query->fetchAll();
}
<meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0">
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=10">
- <title>poche : queue</title>
+ <title>poche, a read it later open source system</title>
+ <link rel="shortcut icon" type="image/x-icon" href="img/favicon.ico" />
+ <link rel="apple-touch-icon-precomposed" sizes="144x144" href="img/apple-touch-icon-144x144-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="img/apple-touch-icon-72x72-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" href="img/apple-touch-icon-precomposed.png">
<link rel="stylesheet" href="css/knacss.css" media="all">
<link rel="stylesheet" href="css/style.css" media="all">
</head>
<body>
<header>
- <h1><img src="img/logo.png" alt="logo poche" />poche, a read it later open source system</h1>
+ <h1><img src="img/logo.png" alt="logo poche" />poche</h1>
</header>
- <div id="main" class="w800p">
+ <div id="main">
<ul id="links">
- <li><a href="index.php">home</a></li>
- <li><a href="?view=fav">favorites</a></li>
- <li><a href="?view=archive">archive</a></li>
- <li><a 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>
+ <li><a href="index.php" <?php echo (($view == 'index') ? 'class="current"' : ''); ?>>home</a></li>
+ <li><a href="?view=fav" <?php echo (($view == 'fav') ? 'class="current"' : ''); ?>>favorites</a></li>
+ <li><a href="?view=archive" <?php echo (($view == 'archive') ? 'class="current"' : ''); ?>>archive</a></li>
+ <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>
- <ul id="entries">
+ <div id="content">
+ <ul id="entries">
<?php
- foreach ($entries as $entry) {
- echo '<li><a href="readityourself.php?url='.urlencode($entry['url']).'">' . $entry['title'] . '</a> <a href="?action=toggle_archive&id='.$entry['id'].'" title="toggle mark as read" class="tool">✓</a> <a href="?action=toggle_fav&id='.$entry['id'].'" title="toggle favorite" class="tool">'.(($entry['is_fav'] == 0) ? '☆' : '★' ).'</a> <a href="?action=delete&id='.$entry['id'].'" title="toggle delete" class="tool">⨯</a></li>';
+ $i = 1;
+ foreach ($entries as $entry)
+ {
+ ?>
+ <li 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']; ?>
+ </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 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>
+ <?php
+ $i++;
}
?>
- </ul>
+ </ul>
+ </div>
</div>
- <footer class="mr2 mt3">
- <p class="smaller"><a href="http://github.com/nicosomb/poche">poche</a> is a read it later open source system, based on <a href="http://www.memiks.fr/readityourself/">ReadItYourself</a>. <a href="https://twitter.com/getpoche" title="follow us on twitter">@getpoche</a> . Logo by <a href="http://www.iconfinder.com/icondetails/43256/128/jeans_monotone_pocket_icon">Brightmix</a>. poche is developed by <a href="http://nicolas.loeuillet.org">Nicolas Lœuillet</a> under the <a href="http://www.wtfpl.net/">WTFPL</a>.</p>
+ <footer class="mr2 mt3 smaller">
+ <p><a href="https://twitter.com/getpoche" title="follow us on twitter">Follow @getpoche on twitter</a></p>
</footer>
+ <script type="text/javascript" src="js/jquery-1.9.1.min.js"></script>
+ <script type="text/javascript" src="js/poche.js"></script>
</body>
-</html>
\ No newline at end of file
+</html>
projects / github / wallabag / wallabag.git / blobdiff