X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=a1bc74d7d1965415d931e3f10f610e6763365441;hb=a28328a1aa1ece8ffdaf65150936161d0ba207f2;hp=e06c6819f7c5a806ba9d71d99a2854f4e1cbbcb7;hpb=ffe7c5f4e251654501bc5a2bdd690944076ef131;p=brisk.git
diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index e06c681..a1bc74d 100644
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -2,8 +2,8 @@
/*
* brisk - Obj/user.phh
*
- * Copyright (C) 2012 Matteo Nastasi
- * mailto: nastasi@alternativeoutput.it
+ * Copyright (C) 2012-2015 Matteo Nastasi
+ * mailto: nastasi@alternativeoutput.it
* matteo.nastasi@milug.org
* web: http://www.alternativeoutput.it
*
@@ -58,6 +58,7 @@ define('USER_FLAG_TY_ALL', 0xff0000); // done
define('USER_FLAG_TY_NORM', 0x010000); // done
define('USER_FLAG_TY_SUPER', 0x020000); // done
define('USER_FLAG_TY_CERT', 0x040000); // done
+define('USER_FLAG_TY_APPR', 0x080000); // done
// ... other usefull status ...
define('USER_FLAG_TY_FIRONLY', 0x200000); // done
define('USER_FLAG_TY_ADMIN', 0x400000); // done
@@ -116,9 +117,13 @@ class User {
var $laccwr; // last access (for the cleanup)
var $bantime; // timeout to temporary ban
var $stat; // status (outdoor, room, table, game, ...)
- var $subst; // substatus for each status
+ var $subst; // substatus for each status
var $step; // step of the current status
var $trans_step; // step to enable transition between pages (disable == -1)
+ var $cl_step; // current step returned by client
+ var $ping_req; // ping is already requested ?
+
+ var $pend_async; // number of async check that must be returned
var $rd_socket; // socket handle of push stream
var $rd_endtime; // end time for push stream
@@ -126,15 +131,16 @@ class User {
var $rd_subst; // actual substatus of push stream
var $rd_step; // actual step of push stream
var $rd_from; // referer
- var $rd_scristp; // current script step (for each session)
+ 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 ?
var $comm; // commands array
- // var $asta_card; //
+ // var $asta_card; //
// var $asta_pnt; //
// var $handpt; // Total card points at the beginning of the current hand.
// var $exitislock; // Player can exit from the table ?
@@ -145,7 +151,7 @@ class User {
var $table_orig; // id of the current table when you aren't in game
var $table_pos; // idx on the table
var $table_token;// token that identify a game on a table
- var $flags; // Bitfield with: AUTHENTICATE: 0x02
+ var $flags; // Bitfield with: AUTHENTICATE: 0x02
var $rec; // field with user db record or FALSE
var $the_end; // Flag to change the end of the session
@@ -179,6 +185,9 @@ class User {
$thiz->subst = $subst;
$thiz->step = 1;
$thiz->trans_step = -1;
+ $thiz->cl_step = -1;
+ $thiz->ping_req = FALSE;
+ $thiz->pend_async = 0;
$thiz->comm = array();
$thiz->rd_socket = NULL;
@@ -190,6 +199,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;
@@ -231,9 +241,12 @@ class User {
$this->subst = $from->subst;
$this->step = $from->step;
$this->trans_step = $from->trans_step;
+ $this->cl_step = $from->cl_step;
+ $this->ping_req = $from->ping_req;
+ $this->pend_async = $from->pend_async;
$this->comm = array();
- $i_start = (1 > ($from->step - COMM_N) ? 1 : ($from->step - COMM_N));
+ $i_start = (1 > ($from->step - COMM_N) ? 1 : ($from->step - COMM_N));
for ($i = $i_start ; $i < $from->step ; $i++) {
$ii = $i % COMM_N;
if (isset($from->comm[$ii])) {
@@ -270,17 +283,17 @@ class User {
{
if (($thiz = new User()) == FALSE)
return (FALSE);
-
+
$thiz->copy($from);
return ($thiz);
}
-
+
static function spawn($from, $table, $table_pos)
{
if (($thiz = new User()) == FALSE)
return (FALSE);
-
+
$thiz->idx = $from->idx;
$thiz->idx_orig = $from->idx;
$thiz->code = $from->code;
@@ -294,10 +307,13 @@ class User {
$thiz->subst = $from->subst;
$thiz->step = $from->step;
$thiz->trans_step = $from->trans_step;
+ $thiz->cl_step = $from->cl_step;
+ $thiz->ping_req = $from->ping_req;
+ $thiz->pend_async = $from->pend_async;
$thiz->comm = array();
/*
- $i_start = (1 > ($from->step - COMM_N) ? 1 : ($from->step - COMM_N));
+ $i_start = (1 > ($from->step - COMM_N) ? 1 : ($from->step - COMM_N));
for ($i = $i_start ; $i < $from->step ; $i++) {
log_wr("TRY PUSH:".$i);
$ii = $i % COMM_N;
@@ -329,6 +345,33 @@ class User {
return ($thiz);
}
+ function is_appr()
+ {
+ return ($this->flags & USER_FLAG_TY_APPR);
+ }
+
+ 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 is_empty()
+ {
+ return ($this->sess == "");
+ }
+
+ function is_active()
+ {
+ if ($this->sess != "" && !$this->the_end) // OK: is_active()
+ return TRUE;
+ return FALSE;
+ }
+
function flags_set($flags, $mask)
{
$flags_old = $this->flags & (~$mask);
@@ -368,7 +411,7 @@ class User {
$this->rd_endtime = $curtime + RD_ENDTIME_DELTA;
$this->rd_stat = $stat;
$this->rd_subst = $subst;
- $this->rd_step = $step;
+ $this->rd_step = $step; // TRACKED
$this->rd_from = $from;
$this->rd_scristp = 0;
$this->rd_kalive = $curtime + RD_KEEPALIVE_TOUT;
@@ -440,11 +483,11 @@ class User {
function code_get() {
return ($this->code);
}
-
+
function stat_set($stat) {
- log_main("sess: [".$this->sess. "] NEW STAT: [".$stat."]");
+ log_main("sess: [".$this->sess. "] NEW STAT: [".$stat."]");
$this->stat = "$stat";
-
+
/*
if (validate_sess($this->sess)) {
if (file_exists(PROXY_PATH) == FALSE)
@@ -456,10 +499,10 @@ class User {
*/
}
- function step_set($step)
+ function step_set($step)
{
$this->step = $step & 0x7fffffff;
-
+
return (TRUE);
}
@@ -467,12 +510,12 @@ class User {
$this->step += $delta;
/* modularization because unpack() not manage unsigned 32bit int correctly */
$this->step &= 0x7fffffff;
-
+
return TRUE;
}
- function save_step()
+ function save_step()
{
do {
if (validate_sess($this->sess) == FALSE)
@@ -483,22 +526,22 @@ class User {
break;
fwrite($fp, pack("LL",$this->step, $this->idx));
fclose($fp);
-
- log_main("step_set [".$this->sess. "] [".$this->step."]");
-
+
+ log_main("step_set [".$this->sess. "] [".$this->step."]");
+
return (TRUE);
} while (0);
-
+
return (FALSE);
}
-
- static function load_step($sess)
+
+ static function load_step($sess)
{
$fp = FALSE;
do {
if (validate_sess($sess) == FALSE)
break;
-
+
if (file_exists(PROXY_PATH) == FALSE)
mkdir(PROXY_PATH, 0775, TRUE);
if (($fp = @fopen(PROXY_PATH."/".$sess.".step", 'rb')) == FALSE)
@@ -509,16 +552,16 @@ class User {
break;
$arr = unpack('Ls/Li', $s);
fclose($fp);
-
+
// log_rd2("A0: ".$arr[0]." A1: ".$arr[1]);
return ($arr);
} while (0);
-
+
if ($fp != FALSE)
fclose($fp);
-
+
log_rd2("STEP_GET [".$sess."]: return false ");
-
+
return (FALSE);
}
@@ -549,9 +592,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")));
}
@@ -562,12 +616,12 @@ class User {
log_crit("BLOCKING_ERROR UNREC: ".($is_unrecoverable ? "TRUE" : "FALSE"));
return (sprintf(($is_unrecoverable ? 'xstm.stop(); ' : '').'window.onbeforeunload = null; window.onunload = null; document.location.assign("index.php");'));
}
-
+
// FIXME TO SUPPORT iframe
protected function page_sync($sess, $page, $table_idx, $table_token)
{
// log_rd2("page_sync:".var_export(debug_backtrace()));
-
+
log_rd2("PAGE_SYNC");
printf("xXx USER::PAGE_SYNC [%s]\n", get_class($this));
return (sprintf('createCookie("table_idx", %d, 24*365, cookiepath); createCookie("table_token", "%s", 24*365, cookiepath); xstm.stop(); window.onunload = null; window.onbeforeunload = null; document.location.assign("%s");', $table_idx, $table_token, $page));
@@ -582,52 +636,48 @@ class User {
GLOBAL $G_tos_vers, $G_tos_fname, $G_tos_dthard, $G_tos_dtsoft, $G_tos_idx;
GLOBAL $S_load_stat;
-
+
$CO_splashdate = "CO_splashdate".$G_splash_idx;
if (($splashdate = gpcs_var("$CO_splashdate", $get, $post, $cookie)) === FALSE)
$splashdate = "";
log_rd("maincheck begin");
-
- $ret = FALSE;
+
+ $ret = "";
$curtime = time();
-
+
/* Nothing changed, return. */
if ($this->rd_step == $this->step)
return (FALSE);
-
+
log_rd2("do other cur_stat[".$this->rd_stat."] user->stat[".$this->stat."] cur_step[".$this->rd_step."] user_step[".$this->step."]");
-
- if ($this->rd_step == -1) {
- /*
- * if $this->rd_step == -1 load the current state from the main struct
- */
-
+
+ fprintf(STDERR, "ASYNC: %d %d\n", $this->rd_step, $this->pend_async);
+ if ($this->rd_step == -1 && $this->pend_async == 0) {
+ /* if $this->rd_step == -1 load the current state from the main struct */
$S_load_stat['wR_minusone']++;
-
- // if ($this->the_end == TRUE) {
- // log_rd2("main_check: the end".var_export(debug_backtrace()));
- // }
-
+
if ($this->trans_step != -1) {
log_rd2("TRANS USATO ".$this->trans_step);
- $this->rd_step = $this->trans_step;
+ $this->rd_step = $this->step = $this->trans_step; // TRACKED
+ $ret .= $this->room->show_room($this->step, $this);
$this->trans_step = -1;
}
else {
log_rd2("TRANS NON ATTIVATO");
}
}
-
-
+
+ if ($this->pend_async > 0) {
+ return (FALSE);
+ }
/* this part I suppose is read only on $this->room structure */
if ($this->rd_step == -1) {
log_rd2("PRE-NEWSTAT: ".$this->stat);
-
+
if ($this->stat == 'room') {
log_rd("roomma ".$this->step);
- $curtime = time();
if ($this->rec !== FALSE) {
$doc_filepath = $G_base.$G_doc_path.sprintf($G_tos_fname, $G_tos_vers, $G_lang);
$doc_filename = basename($doc_filepath);
@@ -669,13 +719,14 @@ class User {
($is_super ? 0 : $G_splash_timeout));
$ret .= sprintf('|createCookie("CO_splashdate%d", %d, 24*365, cookiepath);', $G_splash_idx, $curtime);
}
+ $this->room->standup_update($this);
$ret .= $this->room->show_room($this->step, $this);
-
+
// TODO uncomment and test
/* NOTE the sets went common */
$this->rd_stat = $this->stat;
$this->rd_subst = $this->subst;
- $this->rd_step = $this->step;
+ $this->rd_step = $this->step; // TRACKED
}
/***************
* *
@@ -692,7 +743,7 @@ class User {
} /* if ($this->rd_step == -1) { */
else {
$S_load_stat['rU_heavy']++;
-
+
if ($this->rd_step < $this->step) {
do {
if ($this->rd_step + COMM_N < $this->step) {
@@ -705,7 +756,7 @@ class User {
log_rd2("lost history, refresh from scratch");
$this->rd_step = -1;
break;
- }
+ }
for ($i = $this->rd_step ; $i < $this->step ; $i++) {
$ii = $i % COMM_N;
log_rd2("ADDED TO THE STREAM: ".$this->comm[$ii]);
@@ -719,33 +770,19 @@ class User {
}
$this->rd_stat = $this->stat;
$this->rd_subst = $this->subst;
- $this->rd_step = $this->step;
+ $this->rd_step = $this->step;
} while (0);
-
+
log_rd2($this->step, 'index_rd.php: after ret set');
-
- if ($this->the_end == TRUE) {
- 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) { ... */
- } /* if ($this->the_end == TRUE) { ... */
+
+ // if ($this->the_end == TRUE) { management is moved
+ // in the spush scope
} /* if ($this->rd_step < $this->step) { */
} /* else of if ($this->rd_step == -1) { */
-
-
+
+ if ($ret == "")
+ $ret = FALSE;
+
return ($ret);
} // function maincheck(...
@@ -767,7 +804,7 @@ class User {
*/
/*
- FROM THE EXTERN
+ FROM THE EXTERN
sess
stat
step
@@ -775,24 +812,24 @@ class User {
function stream_init($init_string, $enc, $header, &$header_out, &$body, $get, $post, $cookie)
{
$curtime = time();
-
+
printf("CLASS: [%s] base: [%s]\n", get_class($this), self::base_get());
log_load("index_rd_init.php");
-
+
if (($from = gpcs_var('from', $get, $post, $cookie)) === FALSE)
$from = "";
- if (($stat = gpcs_var('stat', $get, $post, $cookie)) === FALSE)
+ if (($stat = gpcs_var('stat', $get, $post, $cookie)) === FALSE)
$stat = "";
- if (($subst = gpcs_var('subst', $get, $post, $cookie)) === FALSE)
+ if (($subst = gpcs_var('subst', $get, $post, $cookie)) === FALSE)
$subst = "";
- if (($step = gpcs_var('step', $get, $post, $cookie)) === FALSE)
+ if (($step = gpcs_var('step', $get, $post, $cookie)) === FALSE)
unset($step);
if (($transp = gpcs_var('transp', $get, $post, $cookie)) === FALSE)
$transp = "iframe";
-
+
$this->rd_data_set($curtime, $transp, $enc, $stat, $subst, $step, $from);
-
+
$ret = $this->rd_transp->init($enc, $header, &$header_out, $init_string, self::base_get(), $this->rd_scristp);
if ($ret === FALSE) {
@@ -807,10 +844,10 @@ function stream_init($init_string, $enc, $header, &$header_out, &$body, $get, $p
function stream_main(&$body, $get, $post, $cookie)
{
log_rd2("FROM OUTSIDE - STAT: ".$this->rd_stat." SUBST: ".$this->rd_subst." STEP: ".$this->rd_step." FROM: ".$this->rd_from);
-
-
+
+
$pre_main = gettimeofday(TRUE);
-
+
printf("xXx PRE : rd_step %d\n", $this->rd_step);
if (($ret = $this->maincheck($get, $post, $cookie)) != FALSE) {
$body .= $this->rd_transp->chunk( $this->rd_scristp++, $ret);
@@ -886,5 +923,39 @@ function chunked_fini()
} // end class User
+define('USERSNET_FRIEND_BLACK', 1);
+define('USERSNET_FRIEND_UNKNOWN', 2);
+define('USERSNET_FRIEND_TEST', 3);
+define('USERSNET_FRIEND_FRIEND', 4);
+define('USERSNET_FRIEND_BFF', 5);
+
+if (!isset($__usersnet_friend_map)) {
+ $__usersnet_friend_map = array("black", "unknown", "test", "friend", "bff");
+}
+
+function usersnet_friend_getlabel($id)
+{
+ GLOBAL $__usersnet_friend_map;
+ $id_i = intval($id);
+
+ if ($id_i < 1 || $id_i > count($__usersnet_friend_map)) {
+ return FALSE;
+ }
+ return ($__usersnet_friend_map[$id_i - 1]);
+}
+
+/* return index + 1 of friend label */
+function usersnet_friend_getid($label_in)
+{
+ GLOBAL $__usersnet_friend_map;
+
+ foreach ($__usersnet_friend_map as $id => $label) {
+ if ($label == $label_in) {
+ return ($id + 1);
+ }
+ }
+
+ return FALSE;
+}
?>