X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=50fdd66dbbf308993ddf19da8b7eb877ccc14b5e;hb=14986dd09de4a3e52f42bd0730c44e0ab8fa5099;hp=55562e044d8f9241e852a59198d536488fffce22;hpb=c0a2e9fabf68a881b9aa2c77c04dd12b9b098785;p=brisk.git diff --git a/web/Obj/user.phh b/web/Obj/user.phh index 55562e0..50fdd66 100644 --- a/web/Obj/user.phh +++ b/web/Obj/user.phh @@ -60,9 +60,15 @@ 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); +define('USER_DIS_REA_MALICIOUS', 4); + // 240 is the right value, 600 is for fwrite error test define('RD_ENDTIME_DELTA', 240); define('RD_KEEPALIVE_TOUT', 4); @@ -74,11 +80,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 +327,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) @@ -531,32 +567,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, $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']++; @@ -567,7 +606,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 { @@ -577,22 +616,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("
%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); } @@ -616,15 +683,15 @@ 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"); @@ -635,11 +702,11 @@ class User { $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 == $cur_step) + if ($i == $this->rd_step) continue; else break; @@ -671,10 +738,10 @@ class User { } /* if ($this->the_end == TRUE) { ... */ } /* if ($this->the_end == TRUE) { ... */ - } /* if ($cur_step < $this->step) { */ + } /* if ($this->rd_step < $this->step) { */ /* Room::unlock_data($sem); */ - } /* else of if ($cur_step == -1) { */ + } /* else of if ($this->rd_step == -1) { */ return ($ret); @@ -737,16 +804,6 @@ function stream_init($init_string, $enc, $header, &$header_out, &$body, $get, $p 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); @@ -756,7 +813,7 @@ function stream_main(&$body, $get, $post, $cookie) $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, $splashdate, $table_idx, $table_token)) != FALSE) { + if (($ret = $this->maincheck($old_stat, $old_subst, $old_step, $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).')'); } @@ -789,7 +846,7 @@ function is_supp_custom() return (TRUE); } /* - if ($this->rec->last_dona > 1356994800) { + if ($this->rec->last_dona_get() > 1356994800) { return (TRUE); } */