/**
* Préparation de l'URL avec récupération du contenu avant insertion en base
*/
-function prepare_url($url, $id)
+function prepare_url($url)
{
$parametres = array();
- $url = html_entity_decode(trim($url));
+ $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,'#xtor=RSS-'); if ($i!==false) $url=substr($url,0,$i);
- $title = $url;
+ $title = $url;
if (!preg_match('!^https?://!i', $url))
$url = 'http://' . $url;
if (isset($html) and strlen($html) > 0)
{
$r = new Readability($html, $url);
- $r->convertLinksToFootnotes = TRUE;
+ $r->convertLinksToFootnotes = CONVERT_LINKS_FOOTNOTES;
if($r->init())
{
$content = $r->articleContent->innerHTML;
$parametres['title'] = $r->articleTitle->innerHTML;
- $parametres['content'] = filtre_picture($content, $url, $id);
+ $parametres['content'] = $content;
return $parametres;
}
}
}
}
+function display_view($view, $id = 0, $full_head = 'yes')
+{
+ global $tpl;
+
+ switch ($view)
+ {
+ case 'view':
+ $entry = get_article($id);
+
+ if ($entry != NULL) {
+ $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->draw('view');
+ }
+ else {
+ logm('error in view call : entry is NULL');
+ }
+
+ logm('view link #' . $id);
+ break;
+ default: # home view
+ $entries = get_entries($view);
+
+ $tpl->assign('entries', $entries);
+
+ if ($full_head == 'yes') {
+ $tpl->assign('load_all_js', 1);
+ $tpl->draw('head');
+ $tpl->draw('home');
+ }
+
+ $tpl->draw('entries');
+
+ if ($full_head == 'yes') {
+ $tpl->draw('js');
+ $tpl->draw('footer');
+ }
+ break;
+ }
+}
+
/**
* Appel d'une action (mark as fav, archive, delete)
*/
-
-function action_to_do($action, $id, $url, $token)
+function action_to_do($action, $url, $id = 0)
{
global $db;
if ($url == '')
continue;
- # FIXME corriger cette génération d'ID
- $req = $db->getHandle()->query("SELECT id FROM entries ORDER BY id DESC");
- $id = $req->fetchColumn()+1;
-
- if($parametres_url = prepare_url($url, $id)) {
- $sql_action = 'INSERT INTO entries ( id, url, title, content ) VALUES (?,?, ?, ?)';
- $params_action = array($id,$url, $parametres_url['title'], $parametres_url['content']);
+ if($parametres_url = prepare_url($url)) {
+ $sql_action = 'INSERT INTO entries ( url, title, content ) VALUES (?, ?, ?)';
+ $params_action = array($url, $parametres_url['title'], $parametres_url['content']);
}
logm('add link ' . $url);
break;
case 'delete':
- if (verif_token($token)) {
- remove_directory(ABS_PATH . $id);
- $sql_action = "DELETE FROM entries WHERE id=?";
- $params_action = array($id);
- logm('delete link #' . $id);
- }
- else logm('csrf problem while deleting entry');
+ remove_directory(ABS_PATH . $id);
+ $sql_action = "DELETE FROM entries WHERE id=?";
+ $params_action = array($id);
+ logm('delete link #' . $id);
break;
case 'toggle_fav' :
- if (verif_token($token)) {
- $sql_action = "UPDATE entries SET is_fav=~is_fav WHERE id=?";
- $params_action = array($id);
- logm('mark as favorite link #' . $id);
- }
- else logm('csrf problem while fav entry');
+ $sql_action = "UPDATE entries SET is_fav=~is_fav WHERE id=?";
+ $params_action = array($id);
+ logm('mark as favorite link #' . $id);
break;
case 'toggle_archive' :
- if (verif_token($token)) {
- $sql_action = "UPDATE entries SET is_read=~is_read WHERE id=?";
- $params_action = array($id);
- logm('archive link #' . $id);
- }
- else logm('csrf problem while archive entry');
+ $sql_action = "UPDATE entries SET is_read=~is_read WHERE id=?";
+ $params_action = array($id);
+ logm('archive link #' . $id);
break;
default:
break;
{
$query = $db->getHandle()->prepare($sql_action);
$query->execute($params_action);
+ # if we add a link, we have to download pictures
+ if ($action == 'add') {
+ $last_id = $db->getHandle()->lastInsertId();
+ if (DOWNLOAD_PICTURES) {
+ $content = filtre_picture($parametres_url['content'], $url, $last_id);
+ $sql_update = "UPDATE entries SET content=? WHERE id=?";
+ $params_update = array($content, $last_id);
+ $query_update = $db->getHandle()->prepare($sql_update);
+ $query_update->execute($params_update);
+ }
+ }
}
}
catch (Exception $e)
/**
* Détermine quels liens afficher : home, fav ou archives
*/
-function display_view($view)
+function get_entries($view)
{
global $db;
return $entry;
}
-/**
- * Vérifie si le jeton passé en $_POST correspond à celui en session
- */
-function verif_token($token)
-{
- if(isset($_SESSION['token_poche']) && isset($_SESSION['token_time_poche']) && isset($token))
- {
- if($_SESSION['token_poche'] == $token)
- {
- $old_timestamp = time() - (15*60);
- if($_SESSION['token_time_poche'] >= $old_timestamp)
- {
- return TRUE;
- }
- else {
- session_destroy();
- logm('session expired');
- }
- }
- else {
- logm('token error : the token is different');
- return FALSE;
- }
- }
- else {
- logm('token error : the token is not here');
- return FALSE;
- }
-}
-
function logm($message)
{
$t = strval(date('Y/m/d_H:i:s')).' - '.$_SERVER["REMOTE_ADDR"].' - '.strval($message)."\n";
projects / github / wallabag / wallabag.git / blobdiff