X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2FObj%2Fuser.phh;h=5ef9d9cd5698a9947904cb2c760eb5cfdc23bef9;hb=8b9c2b3ec59baef7c9f64f9663347bc5b9cf69fe;hp=416dbb4f77c9c9444e598a88ccc9030ee913e4f7;hpb=b65dddf6cb8fdc5a98719ed170ca38c2059b362c;p=brisk.git diff --git a/web/Obj/user.phh b/web/Obj/user.phh index 416dbb4..5ef9d9c 100644 --- a/web/Obj/user.phh +++ b/web/Obj/user.phh @@ -59,9 +59,22 @@ define('USER_FLAG_TY_NORM', 0x010000); // done define('USER_FLAG_TY_SUPER', 0x020000); // done define('USER_FLAG_TY_CERT', 0x040000); // done // ... other usefull status ... -define('USER_FLAG_TY_SUSPEND', 0x400000); // done +define('USER_FLAG_TY_FIRONLY', 0x200000); // 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); @@ -73,17 +86,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 @@ -107,6 +131,7 @@ class User { var $rd_cache; // place where store failed fwrite data 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; // @@ -136,11 +161,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; @@ -167,6 +192,7 @@ class User { $thiz->rd_cache = ""; $thiz->rd_zls = FALSE; $thiz->rd_transp = NULL; + $thiz->rd_is_chunked = FALSE; $thiz->asta_card = -2; $thiz->asta_pnt = -1; @@ -303,19 +329,48 @@ class User { return ($thiz); } + 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 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) @@ -329,6 +384,7 @@ class User { $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() { @@ -503,13 +559,16 @@ class User { function myname_innerHTML() { - $class_id = ($this->flags & USER_FLAG_AUTH) + 1; + // 4 -> is certified + // 2 -> is authorized + // 1 -> is myself + $class_id = (($this->flags & USER_FLAG_TY_CERT) >> 16) | ($this->flags & USER_FLAG_AUTH) | 1; return (sprintf('$("myname").innerHTML = "%s";', $class_id, xcape($this->name,ENT_COMPAT,"UTF-8"))); } - /* INDEX_RD_IFRA PORT */ + /* INDEX_RD PORT */ static function blocking_error($is_unrecoverable) { @@ -527,34 +586,35 @@ 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; $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 ($this->rd_step == -1) { /* - * if $cur_step == -1 load the current state from the main struct + * if $this->rd_step == -1 load the current state from the main struct */ $S_load_stat['wR_minusone']++; @@ -565,7 +625,7 @@ class User { if ($this->trans_step != -1) { log_rd2("TRANS USATO ".$this->trans_step); - $cur_step = $this->trans_step; + $this->rd_step = $this->trans_step; $this->trans_step = -1; } else { @@ -575,21 +635,50 @@ class User { /* 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("