projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
js: add info_save() function
[brisk.git]
/
web
/
Obj
/
user.phh
diff --git
a/web/Obj/user.phh
b/web/Obj/user.phh
index
ebb81f1
..
99952e4
100644
(file)
--- a/
web/Obj/user.phh
+++ b/
web/Obj/user.phh
@@
-2,7
+2,7
@@
/*
* brisk - Obj/user.phh
*
/*
* brisk - Obj/user.phh
*
- * Copyright (C) 2012 Matteo Nastasi
+ * Copyright (C) 2012
-2015
Matteo Nastasi
* mailto: nastasi@alternativeoutput.it
* matteo.nastasi@milug.org
* web: http://www.alternativeoutput.it
* 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_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
// ... other usefull status ...
define('USER_FLAG_TY_FIRONLY', 0x200000); // done
define('USER_FLAG_TY_ADMIN', 0x400000); // done
@@
-120,6
+121,9
@@
class User {
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 $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
var $rd_socket; // socket handle of push stream
var $rd_endtime; // end time for push stream
@@
-182,6
+186,8
@@
class User {
$thiz->step = 1;
$thiz->trans_step = -1;
$thiz->cl_step = -1;
$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;
$thiz->comm = array();
$thiz->rd_socket = NULL;
@@
-236,6
+242,8
@@
class User {
$this->step = $from->step;
$this->trans_step = $from->trans_step;
$this->cl_step = $from->cl_step;
$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));
$this->comm = array();
$i_start = (1 > ($from->step - COMM_N) ? 1 : ($from->step - COMM_N));
@@
-300,6
+308,8
@@
class User {
$thiz->step = $from->step;
$thiz->trans_step = $from->trans_step;
$thiz->cl_step = $from->cl_step;
$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();
/*
$thiz->comm = array();
/*
@@
-335,6
+345,11
@@
class User {
return ($thiz);
}
return ($thiz);
}
+ function is_appr()
+ {
+ return ($this->flags & USER_FLAG_TY_APPR);
+ }
+
function is_auth()
{
return ($this->flags & USER_FLAG_AUTH);
function is_auth()
{
return ($this->flags & USER_FLAG_AUTH);
@@
-638,7
+653,8
@@
class User {
log_rd2("do other cur_stat[".$this->rd_stat."] user->stat[".$this->stat."] cur_step[".$this->rd_step."] user_step[".$this->step."]");
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) {
+ 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->rd_step == -1 load the current state from the main struct */
$S_load_stat['wR_minusone']++;
@@
-653,7
+669,9
@@
class User {
}
}
}
}
-
+ 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);
/* this part I suppose is read only on $this->room structure */
if ($this->rd_step == -1) {
log_rd2("PRE-NEWSTAT: ".$this->stat);
@@
-701,6
+719,7
@@
class User {
($is_super ? 0 : $G_splash_timeout));
$ret .= sprintf('|createCookie("CO_splashdate%d", %d, 24*365, cookiepath);', $G_splash_idx, $curtime);
}
($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
$ret .= $this->room->show_room($this->step, $this);
// TODO uncomment and test
@@
-904,5
+923,19
@@
function chunked_fini()
} // end class User
} // end class User
+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 < 0 || $id_i >= count($__usersnet_friend_map)) {
+ return FALSE;
+ }
+ return ($__usersnet_friend_map[$id_i]);
+}
?>
?>