X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=e06c6819f7c5a806ba9d71d99a2854f4e1cbbcb7;hb=14cd1fc05b5d9148de3c427e43bf60cfdf098e9d;hp=e34f8274e799ebc8dad76e722711efe9f67136cd;hpb=1a1f50c83244ae2808cc9126296c8918bd0516a4;p=brisk.git diff --git a/web/Obj/user.phh b/web/Obj/user.phh index e34f827..e06c681 100644 --- a/web/Obj/user.phh +++ b/web/Obj/user.phh @@ -64,12 +64,14 @@ define('USER_FLAG_TY_ADMIN', 0x400000); // done define('USER_FLAG_TY_DISABLE', 0x800000); // done // ... reasons for disabling account ... +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_MAILED', 5); -define('USER_DIS_REA_NU_TOBECHK', 6); +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 @@ -689,7 +691,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) { @@ -697,7 +698,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)); @@ -743,8 +743,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) { */