vier: fix missing icons

[friendica.git] / include / security.php

diff --git a/include/security.php b/include/security.php
index 7c2e2d47c3f95bd35d5a393bcbce6d59fa2093b4..2d6db95f4f899cd6a877198217980c27b54b7d69 100644 (file)
--- a/include/security.php
+++ b/include/security.php
@@ -36,7 +36,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
                $a->timezone = $a->user['timezone'];
        }
 
-       $master_record = $a->user;      
+       $master_record = $a->user;
 
        if((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) {
                $r = q("select * from user where uid = %d limit 1",
@@ -55,7 +55,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
        else
                $a->identities = array();
 
-       $r = q("select `user`.`uid`, `user`.`username`, `user`.`nickname` 
+       $r = q("select `user`.`uid`, `user`.`username`, `user`.`nickname`
                from manage INNER JOIN user on manage.mid = user.uid where `user`.`account_removed` = 0
                and `manage`.`uid` = %d",
                intval($master_record['uid'])
@@ -81,11 +81,20 @@ function authenticate_success($user_record, $login_initial = false, $interactive
        if($login_initial || $login_refresh) {
                $l = get_browser_language();
 
-               q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d LIMIT 1",
+               q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d",
                        dbesc(datetime_convert()),
                        dbesc($l),
                        intval($_SESSION['uid'])
                );
+
+               // Set the login date for all identities of the user
+               q("UPDATE `user` SET `login_date` = '%s' WHERE `password` = '%s' AND `email` = '%s' AND `account_removed` = 0",
+                       dbesc(datetime_convert()),
+                       dbesc($master_record['password']),
+                       dbesc($master_record['email'])
+               );
+
+
        }
        if($login_initial) {
                call_hooks('logged_in', $a->user);
@@ -209,7 +218,7 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
                        }
                }
                if($remote_verified) {
-               
+
                        $gs = '<<>>'; // should be impossible to match
 
                        if(is_array($groups) && count($groups)) {
@@ -310,9 +319,9 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null)
                                dbesc($gs),
                                dbesc($gs)
 */
-                               " AND ( `item`.private = 0 OR ( `item`.private in (1,2) AND wall = 1
+                               " AND ( `item`.private = 0 OR ( `item`.private in (1,2) AND `item`.`wall` = 1
                                  AND ( NOT (`item`.deny_cid REGEXP '<%d>' OR `item`.deny_gid REGEXP '%s')
-                                 AND ( `item`.allow_cid REGEXP '<%d>' OR `item`.allow_gid REGEXP '%s' OR ( allow_cid = '' AND allow_gid = '')))))
+                                 AND ( `item`.allow_cid REGEXP '<%d>' OR `item`.allow_gid REGEXP '%s' OR ( `item`.allow_cid = '' AND `item`.allow_gid = '')))))
                                ",
                                intval($remote_user),
                                dbesc($gs),