X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=50fdd66dbbf308993ddf19da8b7eb877ccc14b5e;hb=14986dd09de4a3e52f42bd0730c44e0ab8fa5099;hp=a7d9357d0995d360f7432c3eaf1fedd62f44b11b;hpb=7408b42dfc2a340ab4830113b23ce8cf87a131c8;p=brisk.git diff --git a/web/Obj/user.phh b/web/Obj/user.phh index a7d9357..50fdd66 100644 --- a/web/Obj/user.phh +++ b/web/Obj/user.phh @@ -60,12 +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); +define('USER_DIS_REA_MALICIOUS', 4); // 240 is the right value, 600 is for fwrite error test define('RD_ENDTIME_DELTA', 240); @@ -78,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 { @@ -314,6 +327,8 @@ class User { { $flags_old = $this->flags & (~$mask); $this->flags = ($flags_old | ($flags & $mask)); + + return ($flags_old); } function prefs_store() @@ -325,12 +340,21 @@ class User { $this->rec->supp_comp_get())); } - function licence_store() + function tos_store() { if (($bdb = BriskDB::create()) == FALSE) { return FALSE; } - return ($bdb->user_licence_update($this->code, $this->rec->lice_vers_get())); + 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) @@ -545,11 +569,11 @@ class User { 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; - GLOBAL $G_lice_vers, $G_lice_fname, $G_lice_dthard, $G_lice_dtsoft, $G_lice_idx; + GLOBAL $G_tos_vers, $G_tos_fname, $G_tos_dthard, $G_tos_dtsoft, $G_tos_idx; GLOBAL $S_load_stat; @@ -599,35 +623,31 @@ class User { log_rd("roomma ".$this->step); $curtime = time(); if ($this->rec !== FALSE) { - if ($curtime > $G_lice_dtsoft || $curtime > $G_lice_dthard) { - if (versions_cmp($this->rec->lice_vers_get(), $G_lice_vers) < 0) { // comparison between user version and current version - if ($curtime > $G_lice_dtsoft) { - // call notify soft - $ret .= show_notify_document("Versione corrente: [".$this->rec->lice_vers_get()."] Versione sito: ".$G_lice_vers, - 0, array("Accetto.", "Rifiuto.", "Leggo poi.", /* , "Scarico." */), - "lice_confirm", 600, 600, TRUE, 0); - $ret .= sprintf("act_licencemgr('soft', g_nd.ret_get(), '%s', '%s');", - xcape($this->rec->lice_vers_get()), xcape($G_lice_vers)); + $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 if ($curtime > $G_lice_dthard) { + else { // call notify hard - $ret .= show_notify_document("Versione corrente: [".$this->rec->lice_vers_get()."] Versione sito: ".$G_lice_vers, - 0, array("Accetto.", "Rifiuto." /* , "Scarico." */), - "lice_confirm", 600, 600, TRUE, 0); - $ret .= sprintf("act_licencemgr('hard', g_nd.ret_get(), '%s', '%s');", - xcape($this->rec->lice_vers_get()), xcape($G_lice_vers)); + $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 .= show_notify_ex(str_replace("\n", " ", "Versione corrente: [".$this->rec->lice_vers_get()."] Versione sito: ".$G_lice_vers), */ - /* ($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, */ - /* ($is_super ? 0 : $G_splash_timeout)); */ - /* $ret .= sprintf('|createCookie("CO_lice_date%d", %d, 24*365, cookiepath);', $G_lice_idx, $curtime); */ - - + $ret .= sprintf("act_tosmgr('%s', g_nd.ret_get(), '%s', '%s');", $type, + xcape($this->rec->tos_vers_get()), xcape($G_tos_vers)); } } } @@ -635,11 +655,11 @@ class User { ($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); }