X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=5ef9d9cd5698a9947904cb2c760eb5cfdc23bef9;hb=8b9c2b3ec59baef7c9f64f9663347bc5b9cf69fe;hp=cf857dd63178b4e15ed3583ae5ea9e6685dbff37;hpb=d74b7138ed4d14834b26355a7f5d9350bc96ee44;p=brisk.git

diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index cf857dd..5ef9d9c 100644
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -60,13 +60,20 @@ define('USER_FLAG_TY_SUPER',   0x020000); // done
 define('USER_FLAG_TY_CERT',    0x040000); // done
 //  ... other usefull status ...
 define('USER_FLAG_TY_FIRONLY', 0x200000); // done
-// define('USER_FLAG_TY_free-to-use', 0x400000); // done
+define('USER_FLAG_TY_ADMIN',   0x400000); // done
 define('USER_FLAG_TY_DISABLE', 0x800000); // done
 
 // ... reasons for disabling account ...
-define('USER_DIS_REA_INVMAIL', 1);
-define('USER_DIS_REA_LICENCE', 2);
-define('USER_DIS_REA_BANNED',  3);
+define('USER_DIS_REA_NONE',       0);
+define('USER_DIS_REA_INVMAIL',    1);
+define('USER_DIS_REA_LICENCE',    2);
+define('USER_DIS_REA_BANNED',     3);
+define('USER_DIS_REA_MALICIOUS',  4);
+define('USER_DIS_REA_NU_ADDED',   5); // new user: new user added by hand or external sql
+define('USER_DIS_REA_NU_MAILED',  6); // new user: mail sent to be confirmed
+define('USER_DIS_REA_NU_TOBECHK', 7); // new user: name verification
+
+
 
 // 240 is the right value, 600 is for fwrite error test
 define('RD_ENDTIME_DELTA',  240);
@@ -322,6 +329,16 @@ class User {
     return ($thiz);
   }
 
+  function is_auth()
+  {
+      return ($this->flags & USER_FLAG_AUTH);
+  }
+
+  function is_cert()
+  {
+      return (($this->flags & USER_FLAG_AUTH) && ($this->flags & USER_FLAG_TY_CERT));
+  }
+
   function flags_set($flags, $mask)
   {
       $flags_old = $this->flags & (~$mask);
@@ -542,7 +559,10 @@ class User {
 
   function myname_innerHTML()
   {
-      $class_id = ($this->flags & USER_FLAG_AUTH) + 1;
+      // 4 -> is certified
+      // 2 -> is authorized
+      // 1 -> is myself
+      $class_id = (($this->flags & USER_FLAG_TY_CERT) >> 16) | ($this->flags & USER_FLAG_AUTH) | 1;
       
       return (sprintf('$("myname").innerHTML = "<span class=\"au%d\">%s</span>";', $class_id, 
                       xcape($this->name,ENT_COMPAT,"UTF-8")));
@@ -684,7 +704,6 @@ class User {
           log_rd2("NEWSTAT: ".$this->stat);
       } /* if ($this->rd_step == -1) { */
       else {
-          /* $sem = Brisk::lock_data(FALSE); */
           $S_load_stat['rU_heavy']++;
           
           if ($this->rd_step < $this->step) {
@@ -692,7 +711,6 @@ class User {
                   if ($this->rd_step + COMM_N < $this->step) {
                       if (($this->rd_stat != $this->stat)) {
                           $to_stat = $this->stat;
-                          /* Brisk::unlock_data($sem); */
                           log_load("RESYNC");
                           printf("xXx USER::MAINCHECK2 [%s]\n", get_class($this));
                           return ($this->page_sync($this->sess, ($to_stat == "table" ? "briskin5/index.php" : "index.php"), $this->table, $this->table_token));
@@ -738,8 +756,6 @@ class User {
                   } /* if ($this->the_end == TRUE) { ... */
               } /* if ($this->the_end == TRUE) { ... */
           } /* if ($this->rd_step < $this->step) { */
-          
-          /* Brisk::unlock_data($sem); */
       }  /* else of if ($this->rd_step == -1) { */