Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / include / security.php

diff --git a/include/security.php b/include/security.php
index fa698c1b1a62aeb48e5ea9953507eb3c6fec0e81..7e14146d9475e97bb5a06d9b4d87928c70b398c9 100644 (file)
--- a/include/security.php
+++ b/include/security.php
@@ -9,8 +9,8 @@ function authenticate_success($user_record, $login_initial = false, $interactive
        $_SESSION['mobile-theme'] = get_pconfig($user_record['uid'], 'system', 'mobile_theme');
        $_SESSION['authenticated'] = 1;
        $_SESSION['page_flags'] = $user_record['page-flags'];
-       $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $user_record['nickname'];
-       $_SESSION['my_address'] = $user_record['nickname'] . '@' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3);
+       $_SESSION['my_url'] = App::get_baseurl() . '/profile/' . $user_record['nickname'];
+       $_SESSION['my_address'] = $user_record['nickname'] . '@' . substr(App::get_baseurl(),strpos(App::get_baseurl(),'://')+3);
        $_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
 
        $a->user = $user_record;
@@ -98,7 +98,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
                call_hooks('logged_in', $a->user);
 
                if(($a->module !== 'home') && isset($_SESSION['return_url']))
-                       goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
+                       goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
        }
 
 }
@@ -378,7 +378,7 @@ function check_form_security_token_redirectOnErr($err_redirect, $typename = '',
                logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
                logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
                notice( check_form_security_std_err_msg() );
-               goaway($a->get_baseurl() . $err_redirect );
+               goaway(App::get_baseurl() . $err_redirect );
        }
 }
 function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token') {