aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-01-27 12:56:36 -0800
committerfriendica <info@friendica.com>2012-01-27 12:56:36 -0800
commit5161be67e9f4eebe5723b44ddd3ad37e18f0a632 (patch)
tree89553157fcbbead7b7cb2fef873f6be0c99dd6fe
parent039eec360ade26e29e1c1d74ed6ab127cd539a4d (diff)
downloadvolse-hubzilla-5161be67e9f4eebe5723b44ddd3ad37e18f0a632.tar.gz
volse-hubzilla-5161be67e9f4eebe5723b44ddd3ad37e18f0a632.tar.bz2
volse-hubzilla-5161be67e9f4eebe5723b44ddd3ad37e18f0a632.zip
logging of manage identities
-rwxr-xr-xboot.php2
-rwxr-xr-xinclude/security.php9
2 files changed, 8 insertions, 3 deletions
diff --git a/boot.php b/boot.php
index 03f324749..c2c99a55e 100755
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1236' );
+define ( 'FRIENDICA_VERSION', '2.3.1237' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1118 );
diff --git a/include/security.php b/include/security.php
index ed5777109..bc2c9f0bf 100755
--- a/include/security.php
+++ b/include/security.php
@@ -35,6 +35,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
}
$master_record = $a->user;
+
if((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) {
$r = q("select * from user where uid = %d limit 1",
intval($_SESSION['submanage'])
@@ -47,18 +48,22 @@ function authenticate_success($user_record, $login_initial = false, $interactive
dbesc($master_record['password']),
dbesc($master_record['email'])
);
- if(count($r))
+ if($r && count($r))
$a->identities = $r;
else
$a->identities = array();
- $r = q("select `user`.`uid`, `user`.`username`, `user`.`nickname` from manage left join user on manage.mid = user.uid
+ $r = q("select `user`.`uid`, `user`.`username`, `user`.`nickname`
+ from manage left join user on manage.mid = user.uid
where `manage`.`uid` = %d",
intval($master_record['uid'])
);
if($r && count($r))
$a->identities = array_merge($a->identities,$r);
+ if($login_initial)
+ logger('auth_identities: ' . print_r($a->identities,true), LOGGER_DEBUG);
+
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
intval($_SESSION['uid']));
if(count($r)) {