diff options
| -rw-r--r-- | bookmarks.php | 8 | ||||
| -rw-r--r-- | services/bookmarkservice.php | 6 | ||||
| -rw-r--r-- | templates/editbookmark.tpl.php | 1 |
3 files changed, 13 insertions, 2 deletions
diff --git a/bookmarks.php b/bookmarks.php index ee3f96b..26bc55f 100644 --- a/bookmarks.php +++ b/bookmarks.php @@ -41,6 +41,7 @@ isset($_POST['description']) ? define('POST_DESCRIPTION', $_POST['description']) isset($_POST['privateNote']) ? define('POST_PRIVATENOTE', $_POST['privateNote']): define('POST_PRIVATENOTE', ''); isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_STATUS', ''); isset($_POST['tags']) ? define('POST_TAGS', $_POST['tags']): define('POST_TAGS', ''); +isset($_POST['referrer']) ? define('POST_REFERRER', $_POST['referrer']): define('POST_REFERRER', ''); isset($_GET['popup']) ? define('GET_POPUP', $_GET['popup']): define('GET_POPUP', ''); isset($_POST['popup']) ? define('POST_POPUP', $_POST['popup']): define('POST_POPUP', ''); @@ -148,7 +149,10 @@ if ($userservice->isLoggedOn() && POST_SUBMITTED != '') { if ($GLOBALS['useredir']) { $address = $GLOBALS['url_redir'] . $address; } - //header('Location: '. $address); // not useful + + if(POST_REFERRER != '') { + header('Location: '. POST_REFERRER); + }die('pr'.POST_REFERRER); } } else { $tplVars['error'] = T_('There was an error saving your bookmark. Please try again or contact the administrator.'); @@ -194,6 +198,7 @@ if ($templatename == 'editbookmark.tpl') { ); } $title = T_('Add a Bookmark'); + $tplVars['referrer'] = $_SERVER['HTTP_REFERER']; $tplVars['pagetitle'] = $title; $tplVars['subtitle'] = $title; $tplVars['btnsubmit'] = T_('Add Bookmark'); @@ -262,6 +267,7 @@ if ($templatename == 'editbookmark.tpl') { $tplVars['summarizeLinkedTags'] = true; $tplVars['pageName'] = PAGE_BOOKMARKS; + $templateservice->loadTemplate($templatename, $tplVars); if ($usecache && $endcache) { diff --git a/services/bookmarkservice.php b/services/bookmarkservice.php index 1d72bc8..5a0137e 100644 --- a/services/bookmarkservice.php +++ b/services/bookmarkservice.php @@ -107,7 +107,11 @@ class BookmarkService { if (!($dbresult = & $this->db->sql_query($sql))) { message_die(GENERAL_ERROR, 'Could not get vars', '', __LINE__, __FILE__, $sql, $this->db); } - $ouput = ($this->db->sql_fetchfield(0, 0) > 0); + if($this->db->sql_fetchfield(0, 0) > 0) { + $output = true; + } else { + $output = false; + } $this->db->sql_freeresult($dbresult); return $output; } diff --git a/templates/editbookmark.tpl.php b/templates/editbookmark.tpl.php index b3514f3..d6f2115 100644 --- a/templates/editbookmark.tpl.php +++ b/templates/editbookmark.tpl.php @@ -95,6 +95,7 @@ $this->includeTemplate("dojo.inc"); <td></td> <td> <input type="submit" name="submitted" value="<?php echo $btnsubmit; ?>" /> + <input type="button" name="cancel" value="<?php echo T_('Cancel') ?>" onclick="javascript: history.go(-1)" /> <?php if (isset($showdelete) && $showdelete) { ?> |