get rid of 'Friendika'

[friendica.git] / include / security.php

diff --git a/include/security.php b/include/security.php
old mode 100755 (executable)
new mode 100644 (file)
index 19e91eb..2f779f5
--- a/include/security.php
+++ b/include/security.php
@@ -6,9 +6,11 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 
        $_SESSION['uid'] = $user_record['uid'];
        $_SESSION['theme'] = $user_record['theme'];
+       $_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['addr'] = $_SERVER['REMOTE_ADDR'];
 
        $a->user = $user_record;
@@ -75,7 +77,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
        header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
 
        if($login_initial) {
-               $l = get_language();
+               $l = get_browser_language();
 
                q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d LIMIT 1",
                        dbesc(datetime_convert()),
@@ -119,12 +121,26 @@ function can_write_wall(&$a,$owner) {
                elseif($verified === 1)
                        return false;
                else {
+                       $cid = 0;
+
+                       if(is_array($_SESSION['remote'])) {
+                               foreach($_SESSION['remote'] as $visitor) {
+                                       if($visitor['uid'] == $owner) {
+                                               $cid = $visitor['cid'];
+                                               break;
+                                       }
+                               }
+                       }
+
+                       if(! $cid)
+                               return false;
+
 
                        $r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` LEFT JOIN `user` on `user`.`uid` = `contact`.`uid` 
                                WHERE `contact`.`uid` = %d AND `contact`.`id` = %d AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
                                AND `user`.`blockwall` = 0 AND `readonly` = 0  AND ( `contact`.`rel` IN ( %d , %d ) OR `user`.`page-flags` = %d ) LIMIT 1",
                                intval($owner),
-                               intval(remote_user()),
+                               intval($cid),
                                intval(CONTACT_IS_SHARING),
                                intval(CONTACT_IS_FRIEND),
                                intval(PAGE_COMMUNITY)
@@ -198,7 +214,7 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
                                        $gs .= '|<' . intval($g) . '>';
                        } 
 
-                       $sql = sprintf(
+                       /*$sql = sprintf(
                                " AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' ) 
                                  AND ( deny_cid  = '' OR  NOT deny_cid REGEXP '<%d>' ) 
                                  AND ( allow_gid = '' OR allow_gid REGEXP '%s' )
@@ -208,6 +224,16 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
                                intval($remote_user),
                                dbesc($gs),
                                dbesc($gs)
+                       );*/
+                       $sql = sprintf(
+                               " AND ( NOT (deny_cid REGEXP '<%d>' OR deny_gid REGEXP '%s')
+                                 AND ( allow_cid REGEXP '<%d>' OR allow_gid REGEXP '%s' OR ( allow_cid = '' AND allow_gid = '') )
+                                 )
+                               ",
+                               intval($remote_user),
+                               dbesc($gs),
+                               intval($remote_user),
+                               dbesc($gs)
                        );
                }
        }
@@ -325,7 +351,7 @@ function check_form_security_token($typename = '', $formname = 'form_security_to
 }
 
 function check_form_security_std_err_msg() {
-       return t('The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before subitting it.') . EOL;
+       return t('The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it.') . EOL;
 }
 function check_form_security_token_redirectOnErr($err_redirect, $typename = '', $formname = 'form_security_token') {
        if (!check_form_security_token($typename, $formname)) {
@@ -338,9 +364,10 @@ function check_form_security_token_redirectOnErr($err_redirect, $typename = '',
 }
 function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token') {
        if (!check_form_security_token($typename, $formname)) {
+           $a = get_app();
                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);
                header('HTTP/1.1 403 Forbidden');
                killme();
        }
-}
\ No newline at end of file
+}