X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=df7e9b17f0f2c21fa980b144a75b66833b5da5e9;hb=2cd263e0bd8a36344e1dac5585b362b25ec19261;hp=f572d983f1356f93dfa15bbc13f5764becb7eaca;hpb=64458521c36de87d10f1c726667faeaaa5126840;p=github%2Fwallabag%2Fwallabag.git diff --git a/inc/functions.php b/inc/functions.php index f572d983..df7e9b17 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -88,10 +88,10 @@ function get_external_file($url) /** * 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 @@ -99,7 +99,7 @@ function prepare_url($url, $id) $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; @@ -107,14 +107,11 @@ function prepare_url($url, $id) 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; - if (DOWNLOAD_PICTURES) { - $content = filtre_picture($content, $url, $id); - } $parametres['content'] = $content; return $parametres; } @@ -229,186 +226,91 @@ function remove_directory($directory) } } -/** - * Appel d'une action (mark as fav, archive, delete) - */ - -function action_to_do($action, $id, $url, $token) +function display_view($view, $id = 0, $full_head = 'yes') { - global $db; + global $tpl, $store; - switch ($action) + switch ($view) { - case 'add': - 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']); + case 'view': + $entry = $store->retrieveOneById($id); + + if ($entry != NULL) { + $tpl->assign('id', $entry['id']); + $tpl->assign('url', $entry['url']); + $tpl->assign('title', $entry['title']); + $tpl->assign('content', $entry['content']); + $tpl->assign('is_fav', $entry['is_fav']); + $tpl->assign('is_read', $entry['is_read']); + $tpl->assign('load_all_js', 0); + $tpl->draw('view'); } - - 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('error in view call : entry is NULL'); } - else logm('csrf problem while deleting entry'); + + logm('view 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); + default: # home view + $entries = $store->getEntriesByView($view); + + $tpl->assign('entries', $entries); + + if ($full_head == 'yes') { + $tpl->assign('load_all_js', 1); + $tpl->draw('head'); + $tpl->draw('home'); } - else logm('csrf problem while fav entry'); - 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); + + $tpl->draw('entries'); + + if ($full_head == 'yes') { + $tpl->draw('js'); + $tpl->draw('footer'); } - else logm('csrf problem while archive entry'); break; - default: - break; - } - - try - { - # action query - if (isset($sql_action)) - { - $query = $db->getHandle()->prepare($sql_action); - $query->execute($params_action); - } - } - catch (Exception $e) - { - logm('action query error : '.$e->getMessage()); } } /** - * Détermine quels liens afficher : home, fav ou archives + * Appel d'une action (mark as fav, archive, delete) */ -function display_view($view) +function action_to_do($action, $url, $id = 0) { - global $db; + global $store; - switch ($_SESSION['sort']) + switch ($action) { - case 'ia': - $order = 'ORDER BY id'; - break; - case 'id': - $order = 'ORDER BY id DESC'; - break; - case 'ta': - $order = 'ORDER BY lower(title)'; - break; - case 'td': - $order = 'ORDER BY lower(title) DESC'; + case 'add': + if ($url == '') + continue; + + if($parametres_url = prepare_url($url)) { + $store->add($url, $parametres_url['title'], $parametres_url['content']); + $last_id = $store->getLastId(); + if (DOWNLOAD_PICTURES) { + $content = filtre_picture($parametres_url['content'], $url, $last_id); + } + } + + logm('add link ' . $url); break; - default: - $order = 'ORDER BY id'; + case 'delete': + remove_directory(ABS_PATH . $id); + $store->deleteById($id); + logm('delete link #' . $id); break; - } - - switch ($view) - { - case 'archive': - $sql = "SELECT * FROM entries WHERE is_read=? " . $order; - $params = array(-1); + case 'toggle_fav' : + $store->favoriteById($id); + logm('mark as favorite link #' . $id); break; - case 'fav' : - $sql = "SELECT * FROM entries WHERE is_fav=? " . $order; - $params = array(-1); + case 'toggle_archive' : + $store->archiveById($id); + logm('archive link #' . $id); break; default: - $sql = "SELECT * FROM entries WHERE is_read=? " . $order; - $params = array(0); break; } - - # view query - try - { - $query = $db->getHandle()->prepare($sql); - $query->execute($params); - $entries = $query->fetchAll(); - } - catch (Exception $e) - { - logm('view query error : '.$e->getMessage()); - } - - return $entries; -} - -/** - * Récupère un article en fonction d'un ID - */ -function get_article($id) -{ - global $db; - - $entry = NULL; - $sql = "SELECT * FROM entries WHERE id=?"; - $params = array(intval($id)); - - # view article query - try - { - $query = $db->getHandle()->prepare($sql); - $query->execute($params); - $entry = $query->fetchAll(); - } - catch (Exception $e) - { - logm('get article query error : '.$e->getMessage()); - } - - 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)