X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=7d82d56b0ed96d75a0431d5a93c02801275bfb6f;hb=7f9618888f9963c4a7daebeb9e3d14ef0a56b968;hp=1eb6f949d708211160a19afbc86a625b843dc685;hpb=152b9a21a2a057869ed1f459ad375c9cb3396ea5;p=brisk.git diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh index 1eb6f94..7d82d56 100644 --- a/web/Obj/brisk.phh +++ b/web/Obj/brisk.phh @@ -1660,13 +1660,13 @@ class Brisk $ret = 2; break; } - if (($user_item = $bdb->getitem_bylogin($user_login, $user_code)) == FALSE) { + if ($user_login == $user->name) { $ret = 3; + $mesg = sprintf($mlang_brisk['inf_self'][$G_lang]); break; } - if ($user_login == $user->name) { + if (($user_item = $bdb->getitem_bylogin($user_login, $user_code)) == FALSE) { $ret = 4; - $mesg = sprintf($mlang_brisk['inf_self'][$G_lang]); break; } if (($guar_item = $bdb->getitem_bycode($user_item->guar_code_get())) != FALSE) { @@ -1677,6 +1677,10 @@ class Brisk } $user_tos_vers = $user_item->tos_vers_get(); + if (($usersnet_item = $bdb->usersnet_bycode($user->code, $user_item->code)) == FALSE) { + $usersnet_item = $bdb->usersnet_default($user->code, $user_item->code); + } + if (versions_cmp($user_tos_vers, "1.2") < 0) { $mesg = sprintf($mlang_brisk['tos_old'][$G_lang], xcape($user_login)); } @@ -1706,7 +1710,9 @@ class Brisk "" : $guar_login), "match" => (versions_cmp($user_tos_vers, "1.4") < 0 ? "non autorizzato" : $user_item->match_cnt) , "game" => (versions_cmp($user_tos_vers, "1.4") < 0 ? "non autorizzato" : $user_item->game_cnt), - "friend" => "unknown")); + "friend" => usersnet_friend_getlabel($usersnet_item->friend), + "skill" => $usersnet_item->skill, + "trust" => $usersnet_item->trust)); } return $jret;