X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=d8230b4b088bba9977d0d72ef2283e4cd4a34eae;hb=c75222f24ff3f47a664f20f5971048d58f20c492;hp=11b808f6326b132436e2769bd20648d46f8967b6;hpb=1fa5c579ed75be5f76de133e638855d7b966680d;p=brisk.git diff --git a/web/Obj/user.phh b/web/Obj/user.phh index 11b808f..d8230b4 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,11 +58,24 @@ 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_SUSPEND', 0x400000); // done +define('USER_FLAG_TY_ADMIN', 0x400000); // done define('USER_FLAG_TY_DISABLE', 0x800000); // done +// ... reasons for disabling account ... +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); define('RD_KEEPALIVE_TOUT', 4); @@ -74,17 +87,28 @@ $S_load_stat = array( 'rU_heavy' => 0, 'wR_minusone' => 0, 'wR_the_end' => 0 ); -$mlang_indrd = array( +$mlang_user = array( 'btn_backtotab' => array('it' => ' torna ai tavoli ', 'en' => ' back to tables '), 'btn_btotabsup' => array('it' => ' grazie della donazione, torna ai tavoli ', - 'en' => ' thank you for donation, back to tables ') + 'en' => ' thank you for donation, back to tables '), + + 'btn_agree' => array('it' => ' accetto ', + 'en' => ' agree '), + 'btn_refuse' => array('it' => ' rifiuto ', + 'en' => ' refuse '), + 'btn_dload' => array('it' => ' scarico ', + 'en' => ' download '), + 'btn_later' => array('it' => ' leggo poi ', + 'en' => ' read later '), + 'toc_date_dscl' => array('it' => 'I nuovi termini di servizio entreranno in vigore il %s.', + 'en' => 'EN I nuovi termini di servizio entreranno in vigore il %s.') ); class User { - var $room; // reference to the room where the user is registered - var $idx; // index in the users array when you are in game - var $idx_orig; // index in the users array when you aren't in game + 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 var $name; // name of the user var $sess; // session of the user @@ -96,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 @@ -106,8 +134,10 @@ 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 ? var $comm; // commands array // var $asta_card; // @@ -137,11 +167,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; @@ -155,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; @@ -166,8 +199,10 @@ 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; $thiz->asta_card = -2; $thiz->asta_pnt = -1; @@ -206,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)); @@ -269,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(); /* @@ -304,19 +345,65 @@ 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); $this->flags = ($flags_old | ($flags & $mask)); + + return ($flags_old); } - function store_set() + function prefs_store() { if (($bdb = BriskDB::create()) == FALSE) { return FALSE; } return ($bdb->user_prefs_update($this->code, ($this->flags & (USER_FLAG_TY_ALL | USER_FLAG_MAP_AUTH)), - $this->rec->supp_comp)); + $this->rec->supp_comp_get())); + } + + function tos_store() + { + if (($bdb = BriskDB::create()) == FALSE) { + return FALSE; + } + return ($bdb->user_tos_update($this->code, $this->rec->tos_vers_get())); + } + + function state_store() + { + if (($bdb = BriskDB::create()) == FALSE) { + return FALSE; + } + return ($bdb->user_state_update($this->code, ($this->flags & (USER_FLAG_TY_ALL | USER_FLAG_MAP_AUTH)), + $this->rec->disa_reas_get())); } function rd_data_set($curtime, $transp, $enc, $stat, $subst, $step, $from) @@ -324,12 +411,13 @@ 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; $this->rd_zls = ZLibStream::create($enc); $this->rd_transp = Transport::create($transp); + $this->rd_is_chunked = $this->rd_transp->is_chunked(); } function rd_socket_get() { @@ -504,13 +592,24 @@ 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"))); } - /* INDEX_RD_IFRA PORT */ + /* INDEX_RD PORT */ static function blocking_error($is_unrecoverable) { @@ -528,45 +627,41 @@ class User { 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)); } - - - - protected function maincheck($cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_subst, &$new_step, $splashdate, $table_idx, $table_token) + protected function maincheck($get, $post, $cookie) { - GLOBAL $G_lang, $mlang_indrd; + GLOBAL $G_lang, $G_base, $G_doc_path, $mlang_user; // GLOBAL $first_loop; GLOBAL $G_with_splash, $G_splash_content, $G_splash_interval, $G_splash_idx; GLOBAL $G_splash_w, $G_splash_h, $G_splash_timeout; - $CO_splashdate = "CO_splashdate".$G_splash_idx; - $$CO_splashdate = $splashdate; - + 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 ($cur_step == $this->step) + if ($this->rd_step == $this->step) return (FALSE); - log_rd2("do other cur_stat[".$cur_stat."] user->stat[".$this->stat."] cur_step[".$cur_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 ($cur_step == -1) { - /* - * if $cur_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); - $cur_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 { @@ -574,34 +669,64 @@ class User { } } - + if ($this->pend_async > 0) { + return (FALSE); + } /* this part I suppose is read only on $this->room structure */ - if ($cur_step == -1) { + 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); + if ($curtime > $G_tos_dtsoft || $curtime > $G_tos_dthard) { + if (versions_cmp($this->rec->tos_vers_get(), $G_tos_vers) < 0) { // comparison between user version and current version + $buttons = array($mlang_user['btn_agree'][$G_lang], $mlang_user['btn_refuse'][$G_lang], + $mlang_user['btn_dload'][$G_lang]); + if ($curtime > $G_tos_dtsoft && $curtime < $G_tos_dthard) { + // call notify soft (same as soft + later button) + array_push($buttons, $mlang_user['btn_later'][$G_lang]); + $type = "soft"; + $preface = sprintf("
%s
", + sprintf($mlang_user['toc_date_dscl'][$G_lang], + strftime("%e/%m/%Y", $G_tos_dthard))); + } + else { + // call notify hard + $type = "hard"; + $preface = ""; + } + $ret .= show_notify_document($preface.esclfhtml(file_get_contents($doc_filepath)), 0, $buttons, + "tos_confirm", sprintf("[ '%s/doc_download.php?doc=%s' ]", SITE_PREFIX, + basename($doc_filename, ".txt")), 600, 600, TRUE, 0); + + $ret .= sprintf("act_tosmgr('%s', g_nd.ret_get(), '%s', '%s');", $type, + xcape($this->rec->tos_vers_get()), xcape($G_tos_vers)); + } + } + } if ($G_with_splash && - ($$CO_splashdate < $curtime - $G_splash_interval || - $$CO_splashdate > $curtime)) { + ($splashdate < $curtime - $G_splash_interval || + $splashdate > $curtime)) { $is_super = $this->flags & USER_FLAG_TY_SUPER; - $ret .= show_notify_ex(str_replace("\n", " ", $G_splash_content[$G_lang]), - ($is_super ? 0 : $G_splash_timeout), - // $mlang_indrd[($is_super ? 'btn_btotabsup' : 'btn_backtotab')][$G_lang], - $mlang_indrd['btn_backtotab'][$G_lang], - $G_splash_w, $G_splash_h, true, + $ret .= show_notify_ex(str_replace("\n", " ", $G_splash_content[$G_lang]), + ($is_super ? 0 : $G_splash_timeout), + // $mlang_user[($is_super ? 'btn_btotabsup' : 'btn_backtotab')][$G_lang], + $mlang_user['btn_backtotab'][$G_lang], + $G_splash_w, $G_splash_h, true, ($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 */ - $new_stat = $this->stat; - $new_subst = $this->subst; - $new_step = $this->step; + $this->rd_stat = $this->stat; + $this->rd_subst = $this->subst; + $this->rd_step = $this->step; // TRACKED } /*************** * * @@ -615,63 +740,51 @@ class User { return ($this->page_sync($this->sess, "briskin5/index.php", $this->table, $this->table_token)); } log_rd2("NEWSTAT: ".$this->stat); - } /* if ($cur_step == -1) { */ + } /* if ($this->rd_step == -1) { */ else { - /* $sem = Room::lock_data(FALSE); */ $S_load_stat['rU_heavy']++; - if ($cur_step < $this->step) { + if ($this->rd_step < $this->step) { do { - if ($cur_step + COMM_N < $this->step) { - if (($cur_stat != $this->stat)) { + 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)); } log_rd2("lost history, refresh from scratch"); - $new_step = -1; + $this->rd_step = -1; break; } - for ($i = $cur_step ; $i < $this->step ; $i++) { + for ($i = $this->rd_step ; $i < $this->step ; $i++) { $ii = $i % COMM_N; log_rd2("ADDED TO THE STREAM: ".$this->comm[$ii]); + if ($this->comm[$ii] == "") { + if ($i == $this->rd_step) + continue; + else + break; + } $ret .= $this->comm[$ii]; } - $new_stat = $this->stat; - $new_subst = $this->subst; - $new_step = $this->step; + $this->rd_stat = $this->stat; + $this->rd_subst = $this->subst; + $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 ($cur_step < $this->step) { */ - - /* Room::unlock_data($sem); */ - } /* else of if ($cur_step == -1) { */ - + + // 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 (... + } // function maincheck(... public static function stream_fini($transp, $init_string, $is_unrecoverable) { @@ -696,13 +809,13 @@ class User { stat step */ -function stream_init($init_string, $enc, &$header_out, &$body, $get, $post, $cookie) +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_ifra_init.php"); + log_load("index_rd_init.php"); if (($from = gpcs_var('from', $get, $post, $cookie)) === FALSE) $from = ""; @@ -717,33 +830,26 @@ function stream_init($init_string, $enc, &$header_out, &$body, $get, $post, $coo $this->rd_data_set($curtime, $transp, $enc, $stat, $subst, $step, $from); - $body .= $this->rd_transp->init($enc, &$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; + } + + $body .= $ret; return TRUE; } function stream_main(&$body, $get, $post, $cookie) { - GLOBAL $G_splash_idx; - - $CO_splashdate = "CO_splashdate".$G_splash_idx; - if (($splashdate = gpcs_var("$CO_splashdate", $get, $post, $cookie)) === FALSE) - $splashdate = ""; - if (($table_idx = gpcs_var("table_idx", $get, $post, $cookie)) === FALSE) - $table_idx = ""; - if (($table_token = gpcs_var("table_token", $get, $post, $cookie)) === FALSE) - $table_token = ""; - log_rd2("FROM OUTSIDE - STAT: ".$this->rd_stat." SUBST: ".$this->rd_subst." STEP: ".$this->rd_step." FROM: ".$this->rd_from); $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, $this->rd_stat, $this->rd_subst, $this->rd_step, $splashdate, $table_idx, $table_token)) != 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).')'); } @@ -757,6 +863,11 @@ function stream_keepalive($with_ping) return ($this->rd_transp->chunk( $this->rd_scristp++, ($with_ping ? "act_ping();" : NULL))); } +function stream_close() +{ + return ($this->rd_transp->close()); +} + static function base_get() { $c = get_called_class(); @@ -771,7 +882,7 @@ function is_supp_custom() return (TRUE); } /* - if ($this->rec->last_dona > 1356994800) { + if ($this->rec->last_dona_get() > 1356994800) { return (TRUE); } */ @@ -779,7 +890,72 @@ function is_supp_custom() return (FALSE); } +function is_chunked() +{ + return $this->rd_is_chunked; +} + + +function chunked_content($content) +{ + if ($this->rd_zls) { + $cont_comp = $this->rd_zls->compress_chunk($content); + } + else { + $cont_comp = $content; + } + $cont_comp_l = mb_strlen($cont_comp, "ASCII"); + // printf("CHUNK: [%s]\n", $content); + + if ($this->is_chunked()) { + return (sprintf("%X\r\n", $cont_comp_l).$cont_comp."\r\n"); + } + else { + return $cont_comp; + } +} + +function chunked_fini() +{ + return sprintf("0\r\n"); +} + + } // 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; +} ?>