aliens/SemanticScuttle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Interface fix: improve referer behaviour (going back to a page)

Browse source 
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@248 b3834d28-1941-0410-a4f8-b48e95affb8f
This commit is contained in:
mensonge 2009-02-04 14:00:16 +00:00
parent c0e46287e4
commit 6829863847
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bookmarks.php
View file

@ -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['privateNote']) ? define('POST_PRIVATENOTE', $_POST['privateNote']): define('POST_PRIVATENOTE', '');
isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_STATUS', ''); isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_STATUS', '');
isset($_POST['tags']) ? define('POST_TAGS', $_POST['tags']): define('POST_TAGS', ''); 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($_GET['popup']) ? define('GET_POPUP', $_GET['popup']): define('GET_POPUP', '');
isset($_POST['popup']) ? define('POST_POPUP', $_POST['popup']): define('POST_POPUP', ''); isset($_POST['popup']) ? define('POST_POPUP', $_POST['popup']): define('POST_POPUP', '');
@ -148,7 +149,10 @@ if ($userservice->isLoggedOn() && POST_SUBMITTED != '') {
if ($GLOBALS['useredir']) { if ($GLOBALS['useredir']) {
$address = $GLOBALS['url_redir'] . $address; $address = $GLOBALS['url_redir'] . $address;
} }
//header('Location: '. $address); // not useful
if(POST_REFERRER != '') {
header('Location: '. POST_REFERRER);
}die('pr'.POST_REFERRER);
} }
} else { } else {
$tplVars['error'] = T_('There was an error saving your bookmark. Please try again or contact the administrator.'); $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'); $title = T_('Add a Bookmark');
$tplVars['referrer'] = $_SERVER['HTTP_REFERER'];
$tplVars['pagetitle'] = $title; $tplVars['pagetitle'] = $title;
$tplVars['subtitle'] = $title; $tplVars['subtitle'] = $title;
$tplVars['btnsubmit'] = T_('Add Bookmark'); $tplVars['btnsubmit'] = T_('Add Bookmark');
@ -262,6 +267,7 @@ if ($templatename == 'editbookmark.tpl') {
$tplVars['summarizeLinkedTags'] = true; $tplVars['summarizeLinkedTags'] = true;
$tplVars['pageName'] = PAGE_BOOKMARKS; $tplVars['pageName'] = PAGE_BOOKMARKS;
$templateservice->loadTemplate($templatename, $tplVars); $templateservice->loadTemplate($templatename, $tplVars);
if ($usecache && $endcache) { if ($usecache && $endcache) {

6
services/bookmarkservice.php
View file

@ -107,7 +107,11 @@ class BookmarkService {
if (!($dbresult = & $this->db->sql_query($sql))) { if (!($dbresult = & $this->db->sql_query($sql))) {
message_die(GENERAL_ERROR, 'Could not get vars', '', __LINE__, __FILE__, $sql, $this->db); 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); $this->db->sql_freeresult($dbresult);
return $output; return $output;
} }

1
templates/editbookmark.tpl.php
View file

@ -95,6 +95,7 @@ $this->includeTemplate("dojo.inc");
<td></td> <td></td>
<td> <td>
<input type="submit" name="submitted" value="<?php echo $btnsubmit; ?>" /> <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 <?php
if (isset($showdelete) && $showdelete) { if (isset($showdelete) && $showdelete) {
?> ?>