diff options
| -rw-r--r-- | bookmarks.php | 15 | ||||
| -rw-r--r-- | services/bookmark2tagservice.php | 2 | ||||
| -rw-r--r-- | templates/bookmarks.tpl.php | 2 |
3 files changed, 8 insertions, 11 deletions
diff --git a/bookmarks.php b/bookmarks.php index a0f15e2..43c2275 100644 --- a/bookmarks.php +++ b/bookmarks.php @@ -34,6 +34,7 @@ isset($_GET['address']) ? define('GET_ADDRESS', $_GET['address']): define('GET_A isset($_GET['description']) ? define('GET_DESCRIPTION', $_GET['description']): define('GET_DESCRIPTION', ''); isset($_GET['privateNote']) ? define('GET_PRIVATENOTE', $_GET['privateNote']): define('GET_PRIVATENOTE', ''); isset($_GET['tags']) ? define('GET_TAGS', $_GET['tags']): define('GET_TAGS', ''); +isset($_GET['copyOf']) ? define('GET_COPYOF', $_GET['copyOf']): define('GET_COPYOF', ''); isset($_POST['title']) ? define('POST_TITLE', $_POST['title']): define('POST_TITLE', ''); isset($_POST['address']) ? define('POST_ADDRESS', $_POST['address']): define('POST_ADDRESS', ''); @@ -183,15 +184,11 @@ if ($templatename == 'editbookmark.tpl') { 'bStatus' => 0, ); $tplVars['tags'] = POST_TAGS; - } else { - $tplVars['row'] = array( - 'bTitle' => stripslashes(GET_TITLE), - 'bAddress' => stripslashes(GET_ADDRESS), - 'bDescription' => stripslashes(GET_DESCRIPTION), - 'bPrivateNote' => stripslashes(GET_PRIVATENOTE), - 'tags' => (GET_TAGS ? explode(',', stripslashes(GET_TAGS)) : array()), - 'bStatus' => 0 - ); + } else { + $tplVars['row'] = $bookmarkservice->getBookmark($_GET['copyOf'], true); + if(!$currentUser->isAdmin()) { + $tplVars['row']['bPrivateNote'] = ''; //only admin can copy private note + } } $title = T_('Add a Bookmark'); $tplVars['referrer'] = $_SERVER['HTTP_REFERER']; diff --git a/services/bookmark2tagservice.php b/services/bookmark2tagservice.php index d09aee2..257db15 100644 --- a/services/bookmark2tagservice.php +++ b/services/bookmark2tagservice.php @@ -203,7 +203,7 @@ class Bookmark2TagService { } function &getTagsForBookmark($bookmarkid) { - if (!is_int($bookmarkid)) { + if (!is_numeric($bookmarkid)) { message_die(GENERAL_ERROR, 'Could not get tags (invalid bookmarkid)', '', __LINE__, __FILE__, $query); return false; } diff --git a/templates/bookmarks.tpl.php b/templates/bookmarks.tpl.php index f7cec77..97a37fa 100644 --- a/templates/bookmarks.tpl.php +++ b/templates/bookmarks.tpl.php @@ -189,7 +189,7 @@ if($currenttag!= '') { if ($userservice->isLoggedOn() && ($currentUser->getId() != $row['uId']) && !$bookmarkservice->bookmarkExists($row['bAddress'], $currentUser->getId())) { - $copy .= ' - <a href="'. createURL('bookmarks', $currentUser->getUsername() .'?action=add&address='. urlencode($row['bAddress']) .'&title='. urlencode($row['bTitle'])). '&description='.urlencode($row['bDescription']). '&tags='.$tagsForCopy .'">'. T_('Copy') .'</a>'; + $copy .= ' - <a href="'. createURL('bookmarks', $currentUser->getUsername() .'?action=add&copyOf='. $row['bId']) .'">'. T_('Copy') .'</a>'; } // Nofollow option |