X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=2c83a01cdecb1fd9daa675441877ef1cad50579e;hb=a98d543666ef272243bd167647e79073222b0a9d;hp=85747c28c602f3e8bb9ee521b58abd082f5a1102;hpb=b5f30b4ffb453702445acadd0968712e9a0d7bfe;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 85747c2..2c83a01 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -153,10 +153,10 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi',
$G_lng = langtolng($G_lang);
$G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "5.2.0";
+$G_brisk_version = "5.2.1";
/* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': puoi creare la tua rete di amicizie con /info, vedere cosa pensano i tuoi amici degli altri utenti e ci sono i nuovi tavoli riservati per registrati e apprendisti.',
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': puoi creare la tua rete di amicizie con /info, vedere cosa pensano i tuoi amici degli altri utenti e ci sono i nuovi tavoli riservati per registrati e apprendisti, corretti alcuni errori.',
'Se vuoi iscriverti alla Mailing List, cliccala!' ),
'en' => array ( 'EN Brisk (Ver. '.$G_brisk_version.'), NOVITA\': puoi creare la tua rete di amicizie con /info,',
'vedere cosa pensano i tuoi amici degli altri utenti e tavoli riservati per registrati e apprendisti.',
@@ -1416,19 +1416,28 @@ 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(false) {
- if ($user->flags & USER_FLAG_ISOLAUTH) {
- $ret .= 'list_set(\'isolation\', false, \''.$mlang_brisk['tit_onisol'][$G_lang].'\' ); ';
- }
- else if ($user->flags & USER_FLAG_LISTAUTH) {
- $ret .= 'list_set(\'auth\', false, \''.$mlang_brisk['tit_onauth'][$G_lang].'\' ); ';
- }
- else {
- $ret .= 'list_set(\'all\', false, \'\' ); ';
+ if ($user->is_auth()) {
+ $model = array('listen' => array('__type' => 'radio'));
+ $content = array('listen' => array('val' => ($user->flags_db & USER_FLAG_ISOLAUTH ? "2" :
+ ($user->flags_db & USER_FLAG_LISTAUTH ? "1" : "0")),
+ 'cur' => ($user->flags & USER_FLAG_ISOLAUTH ? "2" :
+ ($user->flags & USER_FLAG_LISTAUTH ? "1" : "0"))));
+ if ($user->is_supp_custom()) {
+ $comps = $user->rec->supp_comp_get_array();
+ $model['fg'] = array('__type' => 'fields', 'r' => array('__type' => 'value'),
+ 'g' => array('__type' => 'value'), 'b' => array('__type' => 'value'));
+ $model['bg'] = array('__type' => 'fields', 'r' => array('__type' => 'value'),
+ 'g' => array('__type' => 'value'), 'b' => array('__type' => 'value'));
+ $content['fg'] = array('r' => array('val' => $comps['fg']['r'], 'cur' => $comps['fg']['r']),
+ 'g' => array('val' => $comps['fg']['g'], 'cur' => $comps['fg']['g']),
+ 'b' => array('val' => $comps['fg']['b'], 'cur' => $comps['fg']['b']));
+ $content['bg'] = array('r' => array('val' => $comps['bg']['r'], 'cur' => $comps['bg']['r']),
+ 'g' => array('val' => $comps['bg']['g'], 'cur' => $comps['bg']['g']),
+ 'b' => array('val' => $comps['bg']['b'], 'cur' => $comps['bg']['b']));
}
+
+ $ret .= sprintf('g_prefsf.fields_descr_set(JSON.parse(\'%s\'));', json_encode($model));
+ $ret .= sprintf('g_prefsf.json2dom(JSON.parse(\'%s\'));', json_encode($content));
}
if ($user->subst == 'standup')
@@ -2101,7 +2110,7 @@ class Brisk
/* MLANG: "Non puoi cambiare nick a un tavolo per soli autenticati.", "Il nickname \'%s\' è già registrato, se il suo proprietario si autentificherà verrai rinominato d\'ufficio come ghostN." */
if ($user->is_auth()) {
- if (strcasecmp($user->name,$name_new) != 0) {
+ if (strcasecmp($user->name, $name_new) != 0) {
if (( ($user->flags & USER_FLAG_MAP_AUTH) != USER_FLAG_ISOLAUTH) &&
($user->subst == 'standup' ||
($user->subst != 'standup' && $this->table[$user->table]->auth_type == TABLE_AUTH_TY_PUBL)
@@ -2152,6 +2161,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");
@@ -2541,35 +2564,13 @@ class Brisk
$this->user[$idx]->ip = $ip;
$this->user[$idx]->rec = $authenticate;
- $this->user[$idx]->flags = $user_type;
- $this->user[$idx]->flags |= ($authenticate != FALSE ? USER_FLAG_AUTH : 0x00);
- $this->user[$idx]->flags |= ( ($pass != FALSE && $bdb == FALSE) ? USER_FLAG_DBFAILED : 0x00);
- log_auth("XXX", sprintf("FLAGS: [%x]", $this->user[$idx]->flags));
-
+ $this->user[$idx]->flags_db = $user_type;
+ $this->user[$idx]->flags_db |= ($authenticate != FALSE ? USER_FLAG_AUTH : 0x00);
+ $this->user[$idx]->flags_db |= ( ($pass != FALSE && $bdb == FALSE) ? USER_FLAG_DBFAILED : 0x00);
+ log_auth("XXX", sprintf("FLAGS: [%x]", $this->user[$idx]->flags_db));
+ $this->user[$idx]->flags = $this->user[$idx]->flags_db;
if ($authenticate != FALSE) {
$this->user[$idx]->code = $authenticate->code_get();
- if (0 == 1) {
- // all this part is included in the db server
- $this->user[$idx]->flags |= USER_FLAG_LISTAUTH;
-
- if (isset($cookie['CO_list'])) {
- fprintf(STDERR, "QQ: %s CO_list: [%s]\n", __FUNCTION__, $cookie['CO_list']);
- if (strcmp($cookie['CO_list'], "auth") == 0) {
- $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH;
- $this->user[$idx]->flags |= USER_FLAG_LISTAUTH;
- }
- if (strcmp($cookie['CO_list'], "isolation") == 0) {
- $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH;
- $this->user[$idx]->flags |= USER_FLAG_ISOLAUTH;
- }
- else {
- $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH;
- }
- }
- }
- else {
- fprintf(STDERR, "QQ: CO_list not set flags: %x\n", __FUNCTION__, $this->user[$idx]->flags);
- }
}
fprintf(STDERR, "QQ %s: flag %x\n", __FUNCTION__, $this->user[$idx]->flags);
if ($ghost > -1) {
@@ -3540,6 +3541,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 +3554,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;