X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=inline;f=web%2FObj%2Fbrisk.phh;h=5ae7486828d4f5685591cdd9a86e84a04b77ff48;hb=0bd03dfcf85e7eefee56283b814be84aff59bffa;hp=1eb6f949d708211160a19afbc86a625b843dc685;hpb=152b9a21a2a057869ed1f459ad375c9cb3396ea5;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 1eb6f94..5ae7486 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -1643,7 +1643,13 @@ class Brisk
}
}
- function info_show($user, $user_login, $dt)
+ /*
+ function info_show($user, $target, $dt)
+
+ if success return assoc. array with "ret" => 0 and other fields
+ else return an assoc. array with "ret: != 0 and "mesg" with an error description
+ */
+ function info_show($user, $target, $dt)
{
GLOBAL $G_lang, $mlang_brisk, $G_base;
@@ -1652,7 +1658,7 @@ class Brisk
$ret = 0;
do {
- if ($user_login == "") {
+ if ($target == "") {
$ret = 1;
break;
}
@@ -1660,13 +1666,13 @@ class Brisk
$ret = 2;
break;
}
- if (($user_item = $bdb->getitem_bylogin($user_login, $user_code)) == FALSE) {
+ if ($target == $user->name) {
$ret = 3;
+ $mesg = sprintf($mlang_brisk['inf_self'][$G_lang]);
break;
}
- if ($user_login == $user->name) {
+ if (($user_item = $bdb->getitem_bylogin($target, $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,11 +1683,15 @@ 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));
+ $mesg = sprintf($mlang_brisk['tos_old'][$G_lang], xcape($target));
}
else if ($guar_login == "") {
- $mesg = sprintf($mlang_brisk['inf_nfd'][$G_lang], xcape($user_login));
+ $mesg = sprintf($mlang_brisk['inf_nfd'][$G_lang], xcape($target));
}
} while (0);
@@ -1695,7 +1705,7 @@ class Brisk
else {
$jret = json_encode(array("ret" => 0,
"mesg" => "",
- "login" => $user_login,
+ "login" => $target,
// FIXME: state internationalization
"state" =>
($user_item->type & USER_FLAG_TY_APPR ? "Apprendista" :
@@ -1706,7 +1716,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;
@@ -2059,7 +2071,7 @@ class Brisk
if (($bdb = BriskDB::create()) != FALSE) {
$bdb->users_load();
/* MLANG: "Il nickname \'%s\' è già registrato, se il suo proprietario si autentificherà verrai rinominato d\'ufficio come ghostN." */
- if ($bdb->login_exists($name_new)) {
+ if ($bdb->login_exists(strtolower($name_new))) {
$prestr = sprintf($mlang_brisk['nickjust'][$G_lang], xcape($name_new));
$to_user .= nickserv_msg($dt, $prestr);
}
@@ -2072,10 +2084,10 @@ class Brisk
} while (0);
} // nick chat command
else if (strncmp($msg, "/info ", 6) == 0) {
- $guar_user = substr($msg, 6);
+ $info_user = substr($msg, 6);
- error_log("here [" . $guar_user."]");
- echo $this->info_show($user, $guar_user, $dt);
+ error_log("here [" . $info_user."][".escsql(urldecode($info_user)). "]");
+ echo $this->info_show($user, urldecode($info_user), $dt);
}
else if (strncmp($msg, "/st ", 4) == 0) {
log_main("chatt_send BEGIN");
@@ -2358,7 +2370,7 @@ class Brisk
$bdb->users_load();
if ($pass != FALSE) { // TODO: here add a method to $bdb to check if the db is available.
log_auth("XXX", "auth2");
- $authenticate = $bdb->login_verify($name_new, $pass, $code);
+ $authenticate = $bdb->login_verify(strtolower($name_new), $pass, $code);
log_auth("XXX", "authenticate: ".($authenticate != FALSE ? "TRUE" : "FALSE"));
if ($authenticate != FALSE) {
@@ -2370,7 +2382,7 @@ class Brisk
}
}
else {
- $login_exists = $bdb->login_exists($name_new);
+ $login_exists = $bdb->login_exists(strtolower($name_new));
}
}
else {