Merge branch 'friendika-master'
This commit is contained in:
commit
ea978af9c1
4 changed files with 11 additions and 0 deletions
|
@ -1,6 +1,7 @@
|
||||||
|
|
||||||
Options -Indexes
|
Options -Indexes
|
||||||
AddType application/x-java-archive .jar
|
AddType application/x-java-archive .jar
|
||||||
|
AddType audio/ogg .oga
|
||||||
|
|
||||||
<FilesMatch "\.(out|log)$">
|
<FilesMatch "\.(out|log)$">
|
||||||
Deny from all
|
Deny from all
|
||||||
|
|
|
@ -44,6 +44,11 @@
|
||||||
$('#pause').html('');
|
$('#pause').html('');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if(event.keyCode == '36') {
|
||||||
|
event.preventDefault();
|
||||||
|
if(homebase)
|
||||||
|
document.location = homebase;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -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'))) {
|
if(stristr($_SESSION['sysmsg'], t('Permission denied'))) {
|
||||||
header($_SERVER["SERVER_PROTOCOL"] . ' 403 ' . t('Permission denied.'));
|
header($_SERVER["SERVER_PROTOCOL"] . ' 403 ' . t('Permission denied.'));
|
||||||
}
|
}
|
||||||
|
|
|
@ -73,6 +73,7 @@ function dfrn_poll_init(&$a) {
|
||||||
if((int) $xml->status == 1) {
|
if((int) $xml->status == 1) {
|
||||||
$_SESSION['authenticated'] = 1;
|
$_SESSION['authenticated'] = 1;
|
||||||
$_SESSION['visitor_id'] = $r[0]['id'];
|
$_SESSION['visitor_id'] = $r[0]['id'];
|
||||||
|
$_SESSION['visitor_home'] = $r[0]['url'];
|
||||||
notice( $r[0]['username'] . t(' welcomes ') . $r[0]['name'] . EOL);
|
notice( $r[0]['username'] . t(' welcomes ') . $r[0]['name'] . EOL);
|
||||||
// Visitors get 1 day session.
|
// Visitors get 1 day session.
|
||||||
$session_id = session_id();
|
$session_id = session_id();
|
||||||
|
@ -386,6 +387,7 @@ function dfrn_poll_content(&$a) {
|
||||||
if(((int) $xml->status == 0) && ($xml->challenge == $hash) && ($xml->sec == $sec)) {
|
if(((int) $xml->status == 0) && ($xml->challenge == $hash) && ($xml->sec == $sec)) {
|
||||||
$_SESSION['authenticated'] = 1;
|
$_SESSION['authenticated'] = 1;
|
||||||
$_SESSION['visitor_id'] = $r[0]['id'];
|
$_SESSION['visitor_id'] = $r[0]['id'];
|
||||||
|
$_SESSION['visitor_home'] = $r[0]['url'];
|
||||||
notice( $r[0]['username'] . t(' welcomes ') . $r[0]['name'] . EOL);
|
notice( $r[0]['username'] . t(' welcomes ') . $r[0]['name'] . EOL);
|
||||||
// Visitors get 1 day session.
|
// Visitors get 1 day session.
|
||||||
$session_id = session_id();
|
$session_id = session_id();
|
||||||
|
|
Loading…
Reference in a new issue