X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=2c83a01cdecb1fd9daa675441877ef1cad50579e;hb=refs%2Fheads%2Fmeet-appr;hp=6395d706a2bdfd1564639aff31cc9db0b82c2613;hpb=b3228a76777d1eab9e2ed69e1e3b880e050209d5;p=brisk.git

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 6395d70..2c83a01 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -1417,18 +1417,27 @@ class Brisk
     $ret = sprintf('gst.st = %d; ',  $user_step);
 
     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].'\' ); ';
-        }
-        else if ($user->flags & USER_FLAG_LISTAUTH) {
-            $ret .= 'list_set(\'auth\', false, \''.$mlang_brisk['tit_onauth'][$G_lang].'\' ); ';
-        }
-        else {
-            $ret .= 'list_set(\'all\', false, \'\' ); ';
+        $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: "<b>Non puoi cambiare nick a un tavolo per soli autenticati.</b>", "Il nickname <b>\'%s\'</b> &egrave; gi&agrave; registrato, <b>se il suo proprietario si autentificher&agrave; verrai rinominato d\'ufficio come ghost<i>N</i>.</b>" */
         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)
@@ -2555,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) {