projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
load data from usernet table or create a default instance
[brisk.git]
/
web
/
Obj
/
brisk.phh
diff --git
a/web/Obj/brisk.phh
b/web/Obj/brisk.phh
index
1eb6f94
..
760e377
100644
(file)
--- a/
web/Obj/brisk.phh
+++ b/
web/Obj/brisk.phh
@@
-1660,13
+1660,13
@@
class Brisk
$ret = 2;
break;
}
$ret = 2;
break;
}
- if (
($user_item = $bdb->getitem_bylogin($user_login, $user_code)) == FALSE
) {
+ if (
$user_login == $user->name
) {
$ret = 3;
$ret = 3;
+ $mesg = sprintf($mlang_brisk['inf_self'][$G_lang]);
break;
}
break;
}
- if (
$user_login == $user->name
) {
+ if (
($user_item = $bdb->getitem_bylogin($user_login, $user_code)) == FALSE
) {
$ret = 4;
$ret = 4;
- $mesg = sprintf($mlang_brisk['inf_self'][$G_lang]);
break;
}
if (($guar_item = $bdb->getitem_bycode($user_item->guar_code_get())) != FALSE) {
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();
}
$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));
}
if (versions_cmp($user_tos_vers, "1.2") < 0) {
$mesg = sprintf($mlang_brisk['tos_old'][$G_lang], xcape($user_login));
}