Merge pull request #2112 from rabuzarus/2811_group_side

[friendica.git] / include / security.php

diff --git a/include/security.php b/include/security.php
index 078f47d70479ed1836664698d95960f2e6184bc3..2d6db95f4f899cd6a877198217980c27b54b7d69 100644 (file)
--- a/include/security.php
+++ b/include/security.php
@@ -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'])
@@ -86,6 +86,15 @@ function authenticate_success($user_record, $login_initial = false, $interactive
                        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);
@@ -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),