From: Nicolas Lœuillet <nicolas.loeuillet@gmail.com>
Date: Fri, 2 Aug 2013 09:48:57 +0000 (+0200)
Subject: URL is now encoded
X-Git-Tag: 1.0-beta1~5
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=408f3df28e0b872847d2c4b6a91c63bbd18cd7f1;p=github%2Fwallabag%2Fwallabag.git

URL is now encoded
---

diff --git a/inc/functions.php b/inc/functions.php
index 34ecf510..ee26fbaa 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -342,6 +342,8 @@ function action_to_do($action, $url, $id = 0)
             if ($url == '')
                 continue;
 
+            $url = base64_decode($url);
+            error_log(print_r($url, TRUE));
             if (MyTool::isUrl($url)) {
                 if($parametres_url = prepare_url($url)) {
                     if ($store->add($url, $parametres_url['title'], $parametres_url['content'])) {
diff --git a/tpl/config.html b/tpl/config.html
index 43c0104c..2c7df4f7 100644
--- a/tpl/config.html
+++ b/tpl/config.html
@@ -2,7 +2,7 @@
             	<h2>Bookmarklet</h2>
             	<p>Thanks to the bookmarklet, you will be able to easily add a link to your poche. If you don't know how use a bookmarklet, <a href="http://support.mozilla.org/en-US/kb/bookmarklets-perform-common-web-page-tasks">have a look here</a>.</p>
             	<p>Drag & drop this link to your bookmarks bar and have fun with poche.</p>
-                <p><a ondragend="this.click();" style="cursor: move; border: 1px dashed grey; background: white;" title="i am a bookmarklet, use me !" href="javascript:if(top['bookmarklet-url@inthepoche.com']){top['bookmarklet-url@inthepoche.com'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{$poche_url}?action=add&url='%20+%20encodeURIComponent(url),'_self');})();void(0);}">poche it !</a></p>
+                <p><a ondragend="this.click();" style="cursor: move; border: 1px dashed grey; background: white;" title="i am a bookmarklet, use me !" href="javascript:if(top['bookmarklet-url@inthepoche.com']){top['bookmarklet-url@inthepoche.com'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{$poche_url}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">poche it !</a></p>
 
                 <h2>Password</h2>
 	            <form method="post" action="?config" name="loginform">