X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=d6a4395afb1164bcd45c82078e693d82958c04cc;hb=e8903530a6cf61a0b06c63bbabed10a813fea097;hp=fcabab7f509b1e4b0c67d5efa8d5b28c7146b8e6;hpb=bd3aa68b123e6af44c44f3b155d280b40bbd7bd6;p=brisk.git diff --git a/web/Obj/user.phh b/web/Obj/user.phh index fcabab7..d6a4395 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 @@ -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 $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 @@ -182,6 +186,8 @@ class User { $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; @@ -236,6 +242,8 @@ class User { $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)); @@ -300,6 +308,8 @@ class User { $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(); /* @@ -335,6 +345,11 @@ class User { return ($thiz); } + function is_appr() + { + return ($this->flags & USER_FLAG_TY_APPR); + } + function is_auth() { return ($this->flags & USER_FLAG_AUTH); @@ -345,6 +360,18 @@ class User { 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); @@ -384,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; @@ -596,7 +623,7 @@ class User { // log_rd2("page_sync:".var_export(debug_backtrace())); log_rd2("PAGE_SYNC"); - printf("xXx USER::PAGE_SYNC [%s]\n", get_class($this)); + // 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)); } @@ -617,7 +644,7 @@ class User { log_rd("maincheck begin"); - $ret = FALSE; + $ret = ""; $curtime = time(); /* Nothing changed, return. */ @@ -626,20 +653,15 @@ class User { 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 { @@ -647,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); @@ -684,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; @@ -696,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 } /*************** * * @@ -711,7 +736,7 @@ class User { ***************/ else if ($this->stat == 'table') { log_load("RESYNC"); - printf("xXx USER::MAINCHECK1 [%s]\n", get_class($this)); + // printf("xXx USER::MAINCHECK1 [%s]\n", get_class($this)); return ($this->page_sync($this->sess, "briskin5/index.php", $this->table, $this->table_token)); } @@ -726,7 +751,7 @@ class User { if (($this->rd_stat != $this->stat)) { $to_stat = $this->stat; log_load("RESYNC"); - printf("xXx USER::MAINCHECK2 [%s]\n", get_class($this)); + // 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)); } log_rd2("lost history, refresh from scratch"); @@ -746,36 +771,25 @@ 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."); - - $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) { 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(... public static function stream_fini($transp, $init_string, $is_unrecoverable) { - printf("xXx user::stream_fini\n"); + // printf("xXx user::stream_fini\n"); // FIXME: dynamic "Transport_" type $trans_class = Transport::gettype($transp); @@ -800,7 +814,7 @@ function stream_init($init_string, $enc, $header, &$header_out, &$body, $get, $p { $curtime = time(); - printf("CLASS: [%s] base: [%s]\n", get_class($this), self::base_get()); + // printf("CLASS: [%s] base: [%s]\n", get_class($this), self::base_get()); log_load("index_rd_init.php"); @@ -817,7 +831,7 @@ function stream_init($init_string, $enc, $header, &$header_out, &$body, $get, $p $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); + $ret = $this->rd_transp->init($enc, $header, $header_out, $init_string, self::base_get(), $this->rd_scristp); if ($ret === FALSE) { return FALSE; @@ -835,12 +849,12 @@ function stream_main(&$body, $get, $post, $cookie) $pre_main = gettimeofday(TRUE); - printf("xXx PRE : rd_step %d\n", $this->rd_step); + // 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); log_rd2(0, 'index_rd.php: after mop_flush (begin: '.sprintf("%f", $pre_main).')'); } - printf("xXx POST: rd_step %d\n", $this->rd_step); + // printf("xXx POST: rd_step %d\n", $this->rd_step); return TRUE; } @@ -855,10 +869,15 @@ function stream_close() return ($this->rd_transp->close()); } +function stream_postclose_get($sock, $curtime) +{ + return ($this->rd_transp->postclose_get($sock, $curtime)); +} + static function base_get() { $c = get_called_class(); - printf("CALLED_CLASS: [%s]\n", $c); + // printf("CALLED_CLASS: [%s]\n", $c); return $c::BASE; } @@ -910,5 +929,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; +} ?>