projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ipclass-ban' into certified_ipclass-ban
[brisk.git]
/
web
/
Obj
/
user.phh
diff --git
a/web/Obj/user.phh
b/web/Obj/user.phh
index
3e6c4a1
..
e06c681
100644
(file)
--- a/
web/Obj/user.phh
+++ b/
web/Obj/user.phh
@@
-64,10
+64,16
@@
define('USER_FLAG_TY_ADMIN', 0x400000); // done
define('USER_FLAG_TY_DISABLE', 0x800000); // done
// ... reasons for disabling account ...
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_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);
// 240 is the right value, 600 is for fwrite error test
define('RD_ENDTIME_DELTA', 240);
@@
-685,7
+691,6
@@
class User {
log_rd2("NEWSTAT: ".$this->stat);
} /* if ($this->rd_step == -1) { */
else {
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) {
$S_load_stat['rU_heavy']++;
if ($this->rd_step < $this->step) {
@@
-693,7
+698,6
@@
class User {
if ($this->rd_step + COMM_N < $this->step) {
if (($this->rd_stat != $this->stat)) {
$to_stat = $this->stat;
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));
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));
@@
-739,8
+743,6
@@
class User {
} /* if ($this->the_end == TRUE) { ... */
} /* if ($this->the_end == TRUE) { ... */
} /* if ($this->rd_step < $this->step) { */
} /* 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) { */
} /* else of if ($this->rd_step == -1) { */