X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=000ad970e220f6b2af37016daa1eb4a73b67007c;hb=db12d769481823f4c744ce0e3a50404cc6b01cd1;hp=22f8f010ad221837e2ad794b250f9adf387b239a;hpb=106cdff81cb1cd42de2bc38ea81d0b37bd301f1f;p=brisk.git
diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index 22f8f01..000ad97 100644
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -2,7 +2,7 @@
/*
* 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
@@ -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
@@ -69,8 +70,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
@@ -118,6 +120,10 @@ class User {
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
@@ -128,6 +134,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 ?
@@ -178,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;
@@ -189,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;
@@ -230,6 +241,9 @@ 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));
@@ -293,6 +307,9 @@ 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();
/*
@@ -328,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);
@@ -367,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;
@@ -548,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")));
}
@@ -589,29 +644,24 @@ class User {
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 {
@@ -619,14 +669,15 @@ 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);
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);
@@ -656,7 +707,8 @@ class User {
}
}
}
- if ($G_with_splash &&
+ // if ($G_with_splash &&
+ if ($this->is_auth() && (! $this->is_appr()) && $G_with_splash &&
($splashdate < $curtime - $G_splash_interval ||
$splashdate > $curtime)) {
$is_super = $this->flags & USER_FLAG_TY_SUPER;
@@ -668,13 +720,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
}
/***************
* *
@@ -690,7 +743,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 +750,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));
@@ -720,34 +771,18 @@ 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) { */
-
- /* Brisk::unlock_data($sem); */
} /* else of if ($this->rd_step == -1) { */
-
+
+ if ($ret == "")
+ $ret = FALSE;
return ($ret);
} // function maincheck(...
@@ -889,5 +924,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;
+}
?>