X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=7262ef4884fd17f93da93045d25b9bb9e2fd40b5;hb=f7068bc71e92a6290b6efcd8c10771aab8bc3449;hp=f971277947f8b66c7d81acd1003954463977fe3a;hpb=9c96c38b48ab376e202045407786dbcf553febb2;p=brisk.git diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh index f971277..7262ef4 100644 --- a/web/Obj/brisk.phh +++ b/web/Obj/brisk.phh @@ -1416,9 +1416,9 @@ class Brisk $ret = sprintf('gst.st = %d; ', $user_step); - $prefs = Client_prefs::from_user($user); - $ret .= sprintf('prefs_load(\'%s\', false, false);', json_encode($prefs)); - + if ($user->is_auth()) { + $ret .= sprintf('g_prefsn.load(\'%s\');', json_encode($user->prefsn_get())); + } if(false) { if ($user->flags & USER_FLAG_ISOLAUTH) { $ret .= 'list_set(\'isolation\', false, \''.$mlang_brisk['tit_onisol'][$G_lang].'\' ); '; @@ -2152,6 +2152,20 @@ class Brisk echo $this->info_show($user, urldecode($info_user), $dt); } while(0); } + else if (strncmp($msg, "/prefsn", 7) == 0) { + do { + if (! $user->is_auth()) { + if ($mlang_indwr) { + $to_user = nickserv_msg($dt, $mlang_indwr['info_auth'][$G_lang]); + } + else { + $to_user = nickserv_msg($dt, "error"); + } + break; + } + echo $this->prefsn_show($user, $dt); + } while(0); + } else if (strncmp($msg, "/st ", 4) == 0) { log_main("chatt_send BEGIN"); @@ -3540,6 +3554,9 @@ function carousel_top() } } +/* function login_consistency: + name length must be less or equal than 12 chars, + no more than 2 consecutive same character (or generic digits) are allowed */ function login_consistency($name) { $old_c = ''; @@ -3550,6 +3567,9 @@ function login_consistency($name) for ($i = 0 ; $i < mb_strlen($name) ; $i++) { $c = mb_substr($name, $i, 1); if (mb_ereg_match ("[a-zA-Z0-9]", $c)) { + if (mb_ereg_match ("[0-9]", $c)) { + $c = "0"; + } if ($old_c != $c) { $old_c = $c; $old_ct = 1;