X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=inline;f=web%2FObj%2Fuser.phh;h=a31765fde71f3d9db3bd8651c65b2364c27be1ba;hb=6927e112139aee1efffac36cd9b91f4407dc335b;hp=0ac092ae0ac88d913f03e738db0c95a76e353320;hpb=ee5ecba6c30b2ff23e7683f40d93057c6b678a29;p=brisk.git diff --git a/web/Obj/user.phh b/web/Obj/user.phh index 0ac092a..a31765f 100644 --- a/web/Obj/user.phh +++ b/web/Obj/user.phh @@ -60,9 +60,14 @@ define('USER_FLAG_TY_SUPER', 0x020000); // done define('USER_FLAG_TY_CERT', 0x040000); // done // ... other usefull status ... define('USER_FLAG_TY_FIRONLY', 0x200000); // done -define('USER_FLAG_TY_SUSPEND', 0x400000); // done +// define('USER_FLAG_TY_free-to-use', 0x400000); // done define('USER_FLAG_TY_DISABLE', 0x800000); // done +// ... reasons for disabling account ... +define('USER_DIS_REA_INVMAIL', 1); +define('USER_DIS_REA_LICENCE', 2); +define('USER_DIS_REA_BANNED', 3); + // 240 is the right value, 600 is for fwrite error test define('RD_ENDTIME_DELTA', 240); define('RD_KEEPALIVE_TOUT', 4); @@ -74,11 +79,22 @@ $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 { @@ -310,15 +326,34 @@ class User { { $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) @@ -513,7 +548,7 @@ class User { xcape($this->name,ENT_COMPAT,"UTF-8"))); } - /* INDEX_RD_IFRA PORT */ + /* INDEX_RD PORT */ static function blocking_error($is_unrecoverable) { @@ -531,34 +566,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']++; @@ -569,7 +605,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 { @@ -579,22 +615,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("