X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=96706b83fa3fd8c7dfe533d569411baba4346d63;hb=4fdfff6b84a5717c1460820e1f318b4c1626875d;hp=22f8f010ad221837e2ad794b250f9adf387b239a;hpb=106cdff81cb1cd42de2bc38ea81d0b37bd301f1f;p=brisk.git
diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index 22f8f01..96706b8 100644
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -69,8 +69,9 @@ 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); // new user: mail sent to be confirmed
-define('USER_DIS_REA_NU_TOBECHK', 6); // new user: name verification
+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
@@ -328,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);
@@ -548,9 +559,20 @@ class User {
function myname_innerHTML()
{
- $class_id = ($this->flags & USER_FLAG_AUTH) + 1;
-
- return (sprintf('$("myname").innerHTML = "%s";', $class_id,
+ // 4 -> is certified
+ // 2 -> is authorized
+ // 1 -> is myself
+ $class_ids = (($this->flags & USER_FLAG_TY_CERT) >> 16) | ($this->flags & USER_FLAG_AUTH) | 1;
+ $sp = "";
+ $cl = "";
+
+ for ($i = 0 ; $i < 3 ; $i++) {
+ if ($class_ids & (1 << $i)) {
+ $cl .= sprintf("%sau%d", $sp, $i);
+ $sp = " ";
+ }
+ }
+ return (sprintf('$("myname").innerHTML = "%s";', $cl,
xcape($this->name,ENT_COMPAT,"UTF-8")));
}
@@ -690,7 +712,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) {
@@ -698,7 +719,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));
@@ -744,8 +764,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) { */