X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=6cdb1fe4753c5e5fc84912b5d5e1ee1df49c275e;hb=a87f85a2c7763c7556a11838931c92e84083aa88;hp=50fdd66dbbf308993ddf19da8b7eb877ccc14b5e;hpb=14986dd09de4a3e52f42bd0730c44e0ab8fa5099;p=brisk.git
diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index 50fdd66..6cdb1fe 100644
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -60,14 +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);
@@ -99,7 +105,7 @@ $mlang_user = array(
);
class User {
- var $room; // reference to the room where the user is registered
+ var $brisk; // reference to the room where the user is registered
var $idx; // index in the room users array when you are in game
var $idx_orig; // index in the room table users array when you aren't in game
var $code; // authentication code
@@ -123,6 +129,7 @@ class User {
var $rd_scristp; // current script step (for each session)
var $rd_kalive; // if no message are sent after RD_KEEPALIVE_TOUT secs we send a keepalive from server
var $rd_cache; // place where store failed fwrite data
+ var $rd_toflush; // bool to inform about unfflushed socket
var $rd_zls; // zlibstream object handle if compressed stream, else FALSE
var $rd_transp; // class that define stream encapsulation type (iframe, xhr, ...)
var $rd_is_chunked; // is the transport chunked or not ?
@@ -155,11 +162,11 @@ class User {
function User() {
}
- static function create(&$room, $idx, $name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") {
+ static function create(&$brisk, $idx, $name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") {
if (($thiz = new User()) == FALSE)
return (FALSE);
- $thiz->room = &$room;
+ $thiz->room = &$brisk;
$thiz->idx = $idx;
$thiz->idx_orig = $idx;
$thiz->code = -1;
@@ -184,6 +191,7 @@ class User {
$thiz->rd_scristp = -1;
$thiz->rd_kalive = -1;
$thiz->rd_cache = "";
+ $thiz->td_toflush = FALSE;
$thiz->rd_zls = FALSE;
$thiz->rd_transp = NULL;
$thiz->rd_is_chunked = FALSE;
@@ -323,6 +331,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);
@@ -543,9 +561,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")));
}
@@ -685,7 +714,6 @@ class User {
log_rd2("NEWSTAT: ".$this->stat);
} /* if ($this->rd_step == -1) { */
else {
- /* $sem = Room::lock_data(FALSE); */
$S_load_stat['rU_heavy']++;
if ($this->rd_step < $this->step) {
@@ -693,7 +721,6 @@ class User {
if ($this->rd_step + COMM_N < $this->step) {
if (($this->rd_stat != $this->stat)) {
$to_stat = $this->stat;
- /* Room::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));
@@ -724,28 +751,23 @@ class User {
log_rd2("LOGOUT BYE BYE!!");
log_auth($this->sess, "Explicit logout.");
- if ($this->the_end == TRUE) {
- $this->reset();
-
- if ($this->subst == 'sitdown') {
- log_load("ROOM WAKEUP");
- $this->room->room_wakeup($this);
- }
- else if ($this->subst == 'standup')
- $this->room->room_outstandup($this);
- else
- log_rd2("LOGOUT FROM WHAT ???");
-
- } /* if ($this->the_end == TRUE) { ... */
+ $this->reset();
+
+ if ($this->subst == 'sitdown') {
+ log_load("ROOM WAKEUP");
+ $this->room->room_wakeup($this);
+ }
+ else if ($this->subst == 'standup')
+ $this->room->room_outstandup($this);
+ else
+ log_rd2("LOGOUT FROM WHAT ???");
} /* if ($this->the_end == TRUE) { ... */
} /* if ($this->rd_step < $this->step) { */
-
- /* Room::unlock_data($sem); */
} /* else of if ($this->rd_step == -1) { */
return ($ret);
- } // function maincheck (...
+ } // function maincheck(...
public static function stream_fini($transp, $init_string, $is_unrecoverable)
{
@@ -809,11 +831,8 @@ function stream_main(&$body, $get, $post, $cookie)
$pre_main = gettimeofday(TRUE);
- $old_stat = $this->rd_stat;
- $old_subst = $this->rd_subst;
- $old_step = $this->rd_step;
printf("xXx PRE : rd_step %d\n", $this->rd_step);
- if (($ret = $this->maincheck($old_stat, $old_subst, $old_step, $get, $post, $cookie)) != FALSE) {
+ if (($ret = $this->maincheck($get, $post, $cookie)) != FALSE) {
$body .= $this->rd_transp->chunk( $this->rd_scristp++, $ret);
log_rd2(0, 'index_rd.php: after mop_flush (begin: '.sprintf("%f", $pre_main).')');
}