X-Git-Url: http://mop.ddnsfree.com/gitweb/?p=brisk.git;a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=760e3771dbba40673c3bd08d59f737b7200c22f1;hp=1eb6f949d708211160a19afbc86a625b843dc685;hb=a77cf3db1fbace39c49b030b9e144a316f007373;hpb=152b9a21a2a057869ed1f459ad375c9cb3396ea5 diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh index 1eb6f94..760e377 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 (($usernet_item = $bdb->usernet_bycode($user->code, $user_item->code)) == FALSE) { + $usernet_item = $bdb->usernet_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)); }