From 64628c800d711c3a3c28e2bf94efd7e8b26a5eba Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 4 Jan 2011 05:06:10 -0800 Subject: [PATCH] provide "return home" key --- .htaccess | 1 + include/main.js | 5 +++++ index.php | 3 +++ mod/dfrn_poll.php | 2 ++ 4 files changed, 11 insertions(+) diff --git a/.htaccess b/.htaccess index b6d4eecc33..b06dd8bdc3 100644 --- a/.htaccess +++ b/.htaccess @@ -1,6 +1,7 @@ Options -Indexes AddType application/x-java-archive .jar +AddType audio/ogg .oga Deny from all diff --git a/include/main.js b/include/main.js index ef6b059ccf..d137d4c9c6 100644 --- a/include/main.js +++ b/include/main.js @@ -44,6 +44,11 @@ $('#pause').html(''); } } + if(event.keyCode == '36') { + event.preventDefault(); + if(homebase) + document.location = homebase; + } }); }); diff --git a/index.php b/index.php index 2e14e7d2ac..cbc85accf4 100644 --- a/index.php +++ b/index.php @@ -173,6 +173,9 @@ if($a->module_loaded) { } +if(x($_SESSION,'visitor_home')) + $a->page['content'] .= ''; + if(stristr($_SESSION['sysmsg'], t('Permission denied'))) { header($_SERVER["SERVER_PROTOCOL"] . ' 403 ' . t('Permission denied.')); } diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index 52272efade..1061cdb899 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -73,6 +73,7 @@ function dfrn_poll_init(&$a) { if((int) $xml->status == 1) { $_SESSION['authenticated'] = 1; $_SESSION['visitor_id'] = $r[0]['id']; + $_SESSION['visitor_home'] = $r[0]['url']; notice( $r[0]['username'] . t(' welcomes ') . $r[0]['name'] . EOL); // Visitors get 1 day session. $session_id = session_id(); @@ -386,6 +387,7 @@ function dfrn_poll_content(&$a) { if(((int) $xml->status == 0) && ($xml->challenge == $hash) && ($xml->sec == $sec)) { $_SESSION['authenticated'] = 1; $_SESSION['visitor_id'] = $r[0]['id']; + $_SESSION['visitor_home'] = $r[0]['url']; notice( $r[0]['username'] . t(' welcomes ') . $r[0]['name'] . EOL); // Visitors get 1 day session. $session_id = session_id();