flash messages pour indiquer qu'une action s'est bien effectuée ou qu'il y a eu une...

[github/wallabag/wallabag.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index abf70a93429794a5bc60fced734f07466e87dda6..205f3968130dd51da4809679ca5ae2cb758479dc 100644 (file)
--- 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
@@ -117,6 +125,7 @@ function prepare_url($url)
         }
     }
 
+    $msg->add('e', 'error during url preparation');
     logm('error during url preparation');
     return FALSE;
 }
@@ -228,13 +237,13 @@ function remove_directory($directory)
 
 function display_view($view, $id = 0, $full_head = 'yes')
 {
-    global $tpl, $store;
+    global $tpl, $store, $msg;
 
     switch ($view)
     {
         case 'export':
             $entries = $store->retrieveAll();
-            $tpl->assign('export', json_encode($entries));
+            $tpl->assign('export', myTool::renderJson($entries));
             $tpl->draw('export');
             logm('export view');
             break;
@@ -292,7 +301,7 @@ function display_view($view, $id = 0, $full_head = 'yes')
  */
 function action_to_do($action, $url, $id = 0)
 {
-    global $store;
+    global $store, $msg;
 
     switch ($action)
     {
@@ -300,27 +309,37 @@ function action_to_do($action, $url, $id = 0)
             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);
+            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 {
+                $msg->add('e', 'the link has been added successfully');
+                logm($url . ' is not a valid url');
+            }
 
             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: