X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=205f3968130dd51da4809679ca5ae2cb758479dc;hb=8444bb0600f2432835a7ceaad8c87d4e63f26bd4;hp=68c3612f1952628d154ca14cb1e4ad16d4344747;hpb=ebf7a07bff8be55160ff5e5999f095e82f97277f;p=github%2Fwallabag%2Fwallabag.git

diff --git a/inc/functions.php b/inc/functions.php
index 68c3612f..205f3968 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * poche, a read it later open source system
+ *
+ * @category   poche
+ * @author     Nicolas Lœuillet <support@inthepoche.com>
+ * @copyright  2013
+ * @license    http://www.wtfpl.net/ see COPYING file
+ */
 
 /**
  * Permet de générer l'URL de poche pour le bookmarklet
@@ -7,7 +15,7 @@ function get_poche_url()
 {
     $protocol = "http";
     if(isset($_SERVER['HTTPS'])) {
-        if($_SERVER['HTTPS'] != "off") {
+        if($_SERVER['HTTPS'] != "off" && $_SERVER['HTTPS'] != "") {
             $protocol = "https";
         }
     }
@@ -88,10 +96,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 +107,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,16 +115,17 @@ 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;
-            $parametres['content'] = filtre_picture($content, $url, $id);
+            $parametres['content'] = $content;
             return $parametres;
         }
     }
 
+    $msg->add('e', 'error during url preparation');
     logm('error during url preparation');
     return FALSE;
 }
@@ -226,184 +235,115 @@ 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, $msg;
 
-    switch ($action)
+    switch ($view)
     {
-        case 'add':
-            if ($url == '')
-                continue;
-
-            $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']);
-            }
-
-            logm('add link ' . $url);
+        case 'export':
+            $entries = $store->retrieveAll();
+            $tpl->assign('export', myTool::renderJson($entries));
+            $tpl->draw('export');
+            logm('export view');
             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');
+        case 'config':
+            $tpl->assign('load_all_js', 0);
+            $tpl->draw('head');
+            $tpl->draw('home');
+            $tpl->draw('config');
+            $tpl->draw('js');
+            $tpl->draw('footer');
+            logm('config view');
             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);
+        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');
             }
-            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);
+            else {
+                logm('error in view call : entry is NULL');
             }
-            else logm('csrf problem while archive entry');
-            break;
-        default:
+
+            logm('view link #' . $id);
             break;
-    }
+        default: # home view
+            $entries = $store->getEntriesByView($view);
 
-    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());
-    }
-}
+            $tpl->assign('entries', $entries);
 
-/**
- * Détermine quels liens afficher : home, fav ou archives
- */
-function display_view($view)
-{
-    global $db;
+            if ($full_head == 'yes') {
+                $tpl->assign('load_all_js', 1);
+                $tpl->draw('head');
+                $tpl->draw('home');
+            }
 
-    switch ($_SESSION['sort'])
-    {
-        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';
-            break;
-        default:
-            $order = 'ORDER BY id';
-            break;
-    }
+            $tpl->draw('entries');
 
-    switch ($view)
-    {
-        case 'archive':
-            $sql    = "SELECT * FROM entries WHERE is_read=? " . $order;
-            $params = array(-1);
-            break;
-        case 'fav' :
-            $sql    = "SELECT * FROM entries WHERE is_fav=? " . $order;
-            $params = array(-1);
-            break;
-        default:
-            $sql    = "SELECT * FROM entries WHERE is_read=? " . $order;
-            $params = array(0);
+            if ($full_head == 'yes') {
+                $tpl->draw('js');
+                $tpl->draw('footer');
+            }
             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
+ * Appel d'une action (mark as fav, archive, delete)
  */
-function get_article($id)
+function action_to_do($action, $url, $id = 0)
 {
-    global $db;
-
-    $entry  = NULL;
-    $sql    = "SELECT * FROM entries WHERE id=?";
-    $params = array(intval($id));
+    global $store, $msg;
 
-    # view article query
-    try
-    {
-        $query  = $db->getHandle()->prepare($sql);
-        $query->execute($params);
-        $entry = $query->fetchAll();
-    }
-    catch (Exception $e)
+    switch ($action)
     {
-        logm('get article query error : '.$e->getMessage());
-    }
-
-    return $entry;
-}
+        case 'add':
+            if ($url == '')
+                continue;
 
-/**
- * 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;
+            if (MyTool::isUrl($url)) {
+                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);
+                    }
+                    $msg->add('s', 'the link has been added successfully');
+                }
             }
             else {
-                session_destroy();
-                logm('session expired');
+                $msg->add('e', 'the link has been added successfully');
+                logm($url . ' is not a valid url');
             }
-        }
-        else {
-            logm('token error : the token is different');
-            return FALSE;
-        }
-    }
-    else {
-        logm('token error : the token is not here');
-        return FALSE;
+
+            logm('add link ' . $url);
+            break;
+        case 'delete':
+            remove_directory(ABS_PATH . $id);
+            $store->deleteById($id);
+            $msg->add('s', 'the link has been deleted successfully');
+            logm('delete link #' . $id);
+            break;
+        case 'toggle_fav' :
+            $store->favoriteById($id);
+            $msg->add('s', 'the favorite toggle has been done successfully');
+            logm('mark as favorite link #' . $id);
+            break;
+        case 'toggle_archive' :
+            $store->archiveById($id);
+            $msg->add('s', 'the archive toggle has been done successfully');
+            logm('archive link #' . $id);
+            break;
+        default:
+            break;
     }
 }