diff options
| author | Nicolas Lœuillet <nicolas.loeuillet@gmail.com> | 2013-08-02 11:48:57 +0200 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas.loeuillet@gmail.com> | 2013-08-02 11:48:57 +0200 |
| commit | 408f3df28e0b872847d2c4b6a91c63bbd18cd7f1 (patch) | |
| tree | 61e5d55719c857c674c2aacaaaec6ee369f1d541 | |
| parent | 2ee436eaa19fd5819a0e6c705b5fcc93f11fb338 (diff) | |
| download | wallabag-408f3df28e0b872847d2c4b6a91c63bbd18cd7f1.tar.gz wallabag-408f3df28e0b872847d2c4b6a91c63bbd18cd7f1.tar.zst wallabag-408f3df28e0b872847d2c4b6a91c63bbd18cd7f1.zip | |
URL is now encoded
| -rw-r--r-- | inc/functions.php | 2 | ||||
| -rw-r--r-- | tpl/config.html | 2 |
2 files changed, 3 insertions, 1 deletions
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) | |||
| 342 | if ($url == '') | 342 | if ($url == '') |
| 343 | continue; | 343 | continue; |
| 344 | 344 | ||
| 345 | $url = base64_decode($url); | ||
| 346 | error_log(print_r($url, TRUE)); | ||
| 345 | if (MyTool::isUrl($url)) { | 347 | if (MyTool::isUrl($url)) { |
| 346 | if($parametres_url = prepare_url($url)) { | 348 | if($parametres_url = prepare_url($url)) { |
| 347 | if ($store->add($url, $parametres_url['title'], $parametres_url['content'])) { | 349 | 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 @@ | |||
| 2 | <h2>Bookmarklet</h2> | 2 | <h2>Bookmarklet</h2> |
| 3 | <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> | 3 | <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> |
| 4 | <p>Drag & drop this link to your bookmarks bar and have fun with poche.</p> | 4 | <p>Drag & drop this link to your bookmarks bar and have fun with poche.</p> |
| 5 | <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> | 5 | <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> |
| 6 | 6 | ||
| 7 | <h2>Password</h2> | 7 | <h2>Password</h2> |
| 8 | <form method="post" action="?config" name="loginform"> | 8 | <form method="post" action="?config" name="loginform"> |