X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=5ef9d9cd5698a9947904cb2c760eb5cfdc23bef9;hb=8b9c2b3ec59baef7c9f64f9663347bc5b9cf69fe;hp=623575976666863d3b01db46a8c17602eb2efadd;hpb=8e29e6c5f6919cdf37bed7f6782ac549c14e6210;p=brisk.git
diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index 6235759..5ef9d9c 100644
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -60,12 +60,20 @@ 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_ADMIN', 0x400000); // done
define('USER_FLAG_TY_DISABLE', 0x800000); // done
-define('USER_DIS_REA_INVMAIL', 1);
-define('USER_DIS_REA_LICENCE', 2);
-define('USER_DIS_REA_BANNED', 3);
+// ... 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);
@@ -78,15 +86,26 @@ $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 $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
@@ -142,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;
@@ -310,10 +329,22 @@ 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 prefs_store()
@@ -325,12 +356,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)
@@ -519,7 +559,10 @@ 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")));
@@ -545,11 +588,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 +642,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." */),
- 400, 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." */),
- 400, 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 +674,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);
}
@@ -665,7 +704,6 @@ class User {
log_rd2("NEWSTAT: ".$this->stat);
} /* if ($this->rd_step == -1) { */
else {
- /* $sem = Room::lock_data(FALSE); */
$S_load_stat['rU_heavy']++;
if ($this->rd_step < $this->step) {
@@ -673,7 +711,6 @@ class User {
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));
@@ -719,13 +756,11 @@ class User {
} /* if ($this->the_end == TRUE) { ... */
} /* if ($this->the_end == TRUE) { ... */
} /* if ($this->rd_step < $this->step) { */
-
- /* Room::unlock_data($sem); */
} /* else of if ($this->rd_step == -1) { */
return ($ret);
- } // function maincheck (...
+ } // function maincheck(...
public static function stream_fini($transp, $init_string, $is_unrecoverable)
{
@@ -789,11 +824,8 @@ function stream_main(&$body, $get, $post, $cookie)
$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, $get, $post, $cookie)) != 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).')');
}