aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2011-01-04 14:48:19 +0100
committerfabrixxm <fabrix.xm@gmail.com>2011-01-04 14:48:19 +0100
commitea978af9c198b5f02c8c0b3d376a1e598f181912 (patch)
treeb1af60496df0bef5c1218e844af5889001cee622
parent0df91fd9a2a78d12378fcb7d9f7cba33f33e845e (diff)
parent64628c800d711c3a3c28e2bf94efd7e8b26a5eba (diff)
downloadvolse-hubzilla-ea978af9c198b5f02c8c0b3d376a1e598f181912.tar.gz
volse-hubzilla-ea978af9c198b5f02c8c0b3d376a1e598f181912.tar.bz2
volse-hubzilla-ea978af9c198b5f02c8c0b3d376a1e598f181912.zip
Merge branch 'friendika-master'
-rw-r--r--.htaccess1
-rw-r--r--include/main.js5
-rw-r--r--index.php3
-rw-r--r--mod/dfrn_poll.php2
4 files changed, 11 insertions, 0 deletions
diff --git a/.htaccess b/.htaccess
index b6d4eecc3..b06dd8bdc 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,6 +1,7 @@
Options -Indexes
AddType application/x-java-archive .jar
+AddType audio/ogg .oga
<FilesMatch "\.(out|log)$">
Deny from all
diff --git a/include/main.js b/include/main.js
index 0fe20955d..94348a682 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 2e14e7d2a..cbc85accf 100644
--- a/index.php
+++ b/index.php
@@ -173,6 +173,9 @@ if($a->module_loaded) {
}
+if(x($_SESSION,'visitor_home'))
+ $a->page['content'] .= '<script>var homebase="' . $_SESSION['visitor_home'] . '" ; </script>';
+
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 52272efad..1061cdb89 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();