X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_wr.php;h=c1fbcfff5c594ea6692db9d6f20e42e7dcff66fc;hb=f6a4ad0c8fed8ed0d3bab5fba9842cf00576c028;hp=0db96eb66e598844ef1a87e42032b5dfa6ccad7e;hpb=9b4aaeb974e7f92e6e124bde29c78a1f5f8fb2b0;p=brisk.git
diff --git a/web/index_wr.php b/web/index_wr.php
index 0db96eb..c1fbcff 100644
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -42,6 +42,8 @@ $mlang_indwr = array( 'btn_backtotab' => array( 'it' => 'Torna ai tavoli.',
'en' => 'close' ),
'commerr' => array( 'it' => 'E\' occorso un errore durante il salvataggio, riprova o contatta l\'amministratore.',
'en' => 'An error was occurred during the saving, try again or contact the administrator.'),
+ 'coerrdb' => array( 'it' => 'Il database è temporaneamente irraggiungibile, riprova più tardi o contatta l\'amministratore.',
+ 'en' => 'The database is temporarly unavailable, retry to later or conctact the administrator.'),
'warrmust' => array( 'it' => 'Per autenticare qualcuno devi a tua volta essere autenticato.',
'en' => 'To authenticate somebody you have to be authenticated in your turn'),
'mesgrepl' => array( 'it' => '
Il messaggio è stato inoltrato all\'amministratore.',
@@ -101,48 +103,53 @@ $is_spawn = FALSE;
log_mop(0, 'index_wr.php: COMM: '.xcapemesg($mesg));
log_wr('COMM: '.xcapemesg($mesg));
-$sem = Room::lock_data();
+$curtime = time();
+$dt = date("H:i ", $curtime);
+
+$sem = Room::lock_data(TRUE);
if (($room = &Room::load_data()) == FALSE) {
echo "Load data error";
log_wr("Load data error");
Room::unlock_data($sem);
exit;
}
-if (($user = &$room->get_user($sess, &$idx)) == FALSE) {
+if (($user = $room->get_user($sess, &$idx)) == FALSE) {
Room::unlock_data($sem);
$argz = explode('|', xcapemesg($mesg));
if ($argz[0] == 'getchallenge') {
- GLOBAL $cli_name;
- if (($a_sem = Challenges::lock_data()) != FALSE) {
- log_main("chal lock data success");
-
- if (($chals = &Challenges::load_data()) != FALSE) {
- $curtime = time();
-
- $token = uniqid("");
- // echo '2|'.$argz[1].'|'.$token.'|'.$_SERVER['REMOTE_ADDR'].'|'.$curtime.'|';
- // exit;
-
- if (($login_new = validate_name(urldecode($cli_name))) != FALSE) {
- if ($chals->add($login_new, $token, $_SERVER['REMOTE_ADDR'], $curtime) != FALSE) {
- echo '0|'.$token;
- }
- else {
- echo '1|';
+ GLOBAL $cli_name;
+ if (($a_sem = Challenges::lock_data(TRUE)) != FALSE) {
+ log_main("chal lock data success");
+
+ if (($chals = &Challenges::load_data()) != FALSE) {
+
+ $token = uniqid("");
+ // echo '2|'.$argz[1].'|'.$token.'|'.$_SERVER['REMOTE_ADDR'].'|'.$curtime.'|';
+ // exit;
+
+ if (($login_new = validate_name(urldecode($cli_name))) != FALSE) {
+ if ($chals->add($login_new, $token, $_SERVER['REMOTE_ADDR'], $curtime) != FALSE) {
+ log_send("SUCCESS: token:".$token);
+ echo '0|'.$token;
+ }
+ else {
+ log_send("getchallenge FAILED");
+ echo '1|';
+ }
+ }
+ else {
+ log_send("getchallenge FAILED");
+ echo '1|';
+ }
+ if ($chals->ismod()) {
+ Challenges::save_data(&$chals);
+ }
}
- }
- else {
- echo '1|';
- }
- if ($chals->ismod()) {
- Challenges::save_data(&$chals);
- }
+
+
+ Challenges::unlock_data($a_sem);
}
-
-
- Challenges::unlock_data($a_sem);
- }
}
else if ($argz[0] == 'auth') {
printf("challenge|ok");
@@ -161,12 +168,10 @@ if (($user = &$room->get_user($sess, &$idx)) == FALSE) {
echo show_notify(str_replace("\n", " ", $G_room_roadmap[$G_lang]), 0, $mlang_indwr['btn_close'][$G_lang], 400, 200);
}
else if ($argz[0] == 'placing') {
- GLOBAL $G_false;
-
require_once("briskin5/Obj/briskin5.phh");
require_once("briskin5/Obj/placing.phh");
- echo show_notify(str_replace("\n", " ", placings_show($G_false)), 0, $mlang_indwr['btn_close'][$G_lang], 800, 600);
+ echo show_notify(str_replace("\n", " ", placings_show(FALSE)), 0, $mlang_indwr['btn_close'][$G_lang], 800, 600);
}
else if ($argz[0] == 'whysupport') {
echo show_notify(str_replace("\n", " ", $G_room_whysupport[$G_lang]), 0, $mlang_indwr['btn_close'][$G_lng], 400, 200);
@@ -190,7 +195,7 @@ if ($argz[0] == 'shutdown') {
log_rd2("AUTO LOGOUT.");
if ($user->subst == 'sitdown' || $user->stat == 'table')
- $room->room_wakeup(&$user);
+ $room->room_wakeup($user);
else if ($user->subst == 'standup')
$room->room_outstandup(&$user);
else {
@@ -200,12 +205,11 @@ if ($argz[0] == 'shutdown') {
else if ($argz[0] == 'warranty') {
GLOBAL $cli_name, $cli_email;
- $curtime = time();
$mesg_to_user = "";
log_wr("INFO:SKIP:argz == warranty name: [".$cli_name."] AUTH: ".($user->flags & USER_FLAG_AUTH));
if ($user->flags & USER_FLAG_AUTH) {
- if (($wa_lock = Warrant::lock_data()) != FALSE) {
+ if (($wa_lock = Warrant::lock_data(TRUE)) != FALSE) {
if (($fp = @fopen(LEGAL_PATH."/warrant.txt", 'a')) != FALSE) {
/* Unix time | session | nickname | IP | where was | mesg */
fwrite($fp, sprintf("%ld|%s|%s|%s|\n", $curtime, $user->name, xcapelt(urldecode($cli_name)), xcapelt(urldecode($cli_email))));
@@ -232,58 +236,62 @@ else if ($argz[0] == 'warranty') {
if ($mesg_to_user != "") {
$user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
- $dt = date("H:i ", $curtime);
$user->comm[$user->step % COMM_N] .= $mesg_to_user;
$user->step_inc();
}
}
else if ($argz[0] == 'mesgtoadm') {
- GLOBAL $cli_subj, $cli_mesg;
-
- $curtime = time();
- $mesg_to_user = "";
-
- log_wr("INFO:SKIP:argz == mesgtoadm name: [".$cli_name."] AUTH: ".($user->flags & USER_FLAG_AUTH));
- if ($user->flags & USER_FLAG_AUTH) {
- if (($wa_lock = Warrant::lock_data()) != FALSE) {
- $userdb = new LoginDB();
-
- if (($ema = $userdb->getmail($user->name)) != FALSE) {
- // mail("nastasi",
- mail("brisk@alternativeoutput.it", urldecode($cli_subj), urldecode($cli_mesg), sprintf("From: %s <%s>", $user->name, $ema));
- }
-
- if (($fp = @fopen(LEGAL_PATH."/messages.txt", 'a')) != FALSE) {
- /* Unix time | session | nickname | IP | where was | mesg */
- fwrite($fp, sprintf("%ld|%s|%s|%s\n", $curtime, $user->name,
- xcapelt(urldecode($cli_subj)), xcapelt(urldecode($cli_mesg))));
- fclose($fp);
- }
- Warrant::unlock_data($wa_lock);
- $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
- /* MLANG: "" */
- $user->comm[$user->step % COMM_N] .= show_notify($mlang_indwr['mesgrepl'][$G_lang], 0, $mlang_indwr['btn_close'][$G_lang], 400, 110);
- $user->step_inc();
- echo "1";
+ GLOBAL $cli_subj, $cli_mesg;
+
+ $mesg_to_user = "";
+
+ log_wr("INFO:SKIP:argz == mesgtoadm name: [".$user->name."] AUTH: ".($user->flags & USER_FLAG_AUTH));
+ if ($user->flags & USER_FLAG_AUTH) {
+ if (($wa_lock = Warrant::lock_data(TRUE)) != FALSE) {
+ if (($bdb = BriskDB::create()) != FALSE) {
+ $bdb->users_load();
+
+ if (($ema = $bdb->getmail($user->name)) != FALSE) {
+ // mail("nastasi",
+ mail("brisk@alternativeoutput.it", urldecode($cli_subj), urldecode($cli_mesg), sprintf("From: %s <%s>", $user->name, $ema));
+ }
+
+ if (($fp = @fopen(LEGAL_PATH."/messages.txt", 'a')) != FALSE) {
+ /* Unix time | session | nickname | IP | where was | mesg */
+ fwrite($fp, sprintf("%ld|%s|%s|%s\n", $curtime, $user->name,
+ xcapelt(urldecode($cli_subj)), xcapelt(urldecode($cli_mesg))));
+ fclose($fp);
+ }
+ Warrant::unlock_data($wa_lock);
+ $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
+ /* MLANG: "" */
+ $user->comm[$user->step % COMM_N] .= show_notify($mlang_indwr['mesgrepl'][$G_lang], 0, $mlang_indwr['btn_close'][$G_lang], 400, 110);
+ $user->step_inc();
+ echo "1";
+ }
+ else {
+ /* MLANG: "Il database è temporaneamente irraggiungibile, riprova più tardi o contatta l\'amministratore." */
+ $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['coerrdb'][$G_lang]);
+ $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
+ }
+ }
+ else {
+ /* MLANG: "E\' occorso un errore durante il salvataggio, riprova o contatta l\'amministratore." */
+ $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['commerr'][$G_lang]);
+ }
+
}
else {
- /* MLANG: "E\' occorso un errore durante il salvataggio, riprova o contatta l\'amministratore." */
- $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['commerr'][$G_lang]);
+ /* MLANG: "Per autenticare qualcuno devi a tua volta essere autenticato." */
+ $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['mesgmust'][$G_lang]);
}
- }
- else {
- /* MLANG: "Per autenticare qualcuno devi a tua volta essere autenticato." */
- $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['mesgmust'][$G_lang]);
- }
-
- if ($mesg_to_user != "") {
- $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
-
- $dt = date("H:i ", $curtime);
- $user->comm[$user->step % COMM_N] .= $mesg_to_user;
- $user->step_inc();
- }
+ if ($mesg_to_user != "") {
+ $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
+
+ $user->comm[$user->step % COMM_N] .= $mesg_to_user;
+ $user->step_inc();
+ }
}
@@ -292,7 +300,6 @@ else if ($argz[0] == 'poll') {
GLOBAL $G_with_poll, $G_poll_name, $cli_choose, $cli_poll_name;
$poll_lock = FALSE;
- $curtime = time();
$mesg_to_user = "";
$fp = FALSE;
@@ -332,7 +339,7 @@ else if ($argz[0] == 'poll') {
break;
}
- if (($poll_lock = Poll::lock_data()) == FALSE) {
+ if (($poll_lock = Poll::lock_data(TRUE)) == FALSE) {
/* MLANG: "E\' occorso un errore durante il salvataggio, riprova o contatta l\'amministratore." */
$mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['commerr'][$G_lang]);
log_wr("break3");
@@ -390,7 +397,6 @@ else if ($argz[0] == 'poll') {
if ($mesg_to_user != "") {
$user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
- $dt = date("H:i ", $curtime);
$user->comm[$user->step % COMM_N] .= $mesg_to_user;
$user->step_inc();
}
@@ -488,7 +494,7 @@ else if ($user->stat == 'room') {
else if ($user->subst == 'standup') {
if ($argz[0] == 'sitdown') {
- log_wr("SITDOWN command");
+ log_wr("SITDOWN command");
if ($user->the_end == TRUE) {
log_wr("INFO:SKIP:argz == sitdown && the_end == TRUE => ignore request.");
@@ -500,13 +506,10 @@ else if ($user->stat == 'room') {
$table_idx = $argz[1];
$table = &$room->table[$table_idx];
- $curtime = time();
-
if ($G_shutdown || $table->wakeup_time > $curtime ||
($table->auth_only && (($user->flags & USER_FLAG_AUTH) == 0)) ) {
$user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
- $dt = date("H:i ", $curtime);
/* MLANG: "Il server sta per essere riavviato, non possono avere inizio nuove partite.", "Il tavolo a cui volevi sederti richiede autentifica.", "Il tavolo si è appena liberato, ci si potrà sedere tra %d secondi." */
if ($G_shutdown) {
$user->comm[$user->step % COMM_N] .= sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['shutmsg'][$G_lang]);
@@ -567,10 +570,8 @@ else if ($user->stat == 'room') {
// START THE SPAWN HERE!!!!
//
- $curtime = time();
-
// Create new spawned table
- $bri_sem = Briskin5::lock_data($table_idx);
+ $bri_sem = Bin5::lock_data(TRUE, $table_idx);
$table_token = uniqid("");
$room->table[$table_idx]->table_token = $table_token;
$room->table[$table_idx]->table_start = $curtime;
@@ -581,15 +582,17 @@ else if ($user->stat == 'room') {
}
log_legal($curtime, $user, "STAT:CREATE_GAME", $plist);
- if (($bri =& new Briskin5(&$room, $table_idx, $table_token)) == FALSE)
+ log_wr("pre new Bin5");
+ if (($bri = new Bin5($room, $table_idx, $table_token)) == FALSE)
log_wr("bri create: FALSE");
else
log_wr("bri create: ".serialize($bri));
+ log_wr("pre init table");
// init table
- $bri_table =& $bri->table[0];
- $bri_table->init(&$bri->user);
- $bri_table->game_init(&$bri->user);
+ $bri_table = $bri->table[0];
+ $bri_table->init($bri->user);
+ $bri_table->game_init($bri->user);
//
// Init spawned users.
//
@@ -597,8 +600,8 @@ else if ($user->stat == 'room') {
//
log_wr("game_init after");
for ($i = 0 ; $i < $table->player_n ; $i++) {
- $bri_user_cur = &$bri->user[$i];
- $user_cur = &$room->user[$table->player[$i]];
+ $bri_user_cur = $bri->user[$i];
+ $user_cur = $room->user[$table->player[$i]];
$bri_user_cur->stat_set('table');
$bri_user_cur->subst = 'asta';
@@ -608,7 +611,6 @@ else if ($user->stat == 'room') {
$bri_user_cur->comm[$bri_user_cur->step % COMM_N] = "";
$bri_user_cur->step_inc();
$bri_user_cur->comm[$bri_user_cur->step % COMM_N] = show_table(&$bri,&$bri_user_cur,$bri_user_cur->step+1,TRUE, FALSE);
-
$bri_user_cur->step_inc();
log_wr("TRY PRESAVE: ".$bri_user_cur->step." TRANS STEP: ".$bri_user_cur->trans_step);
@@ -626,23 +628,20 @@ else if ($user->stat == 'room') {
$user_cur->trans_step = $user_cur->step + 1;
log_wr("TRANS ATTIVATO");
-
$user_cur->stat_set('table');
$user_cur->subst = 'asta';
$user_cur->laccwr = $curtime;
$user_cur->step_inc();
}
log_wr("presave bri");
- Briskin5::save_data($bri);
- Briskin5::unlock_data($bri_sem);
+ Bin5::save_data($bri);
+ Bin5::unlock_data($bri_sem);
log_wr("postsave bri");
}
// change room
- $room->room_sitdown(&$user, $table_idx);
-
- log_wr("MOP finish");
-
+ $room->room_sitdown($user, $table_idx);
+ log_wr("MOP finish");
}
else if ($argz[0] == 'logout') {
$user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
@@ -658,10 +657,10 @@ else if ($user->stat == 'room') {
**********************/
else if ($user->subst == 'sitdown') {
if ($argz[0] == 'wakeup') {
- $room->room_wakeup(&$user);
+ $room->room_wakeup($user);
}
else if ($argz[0] == 'logout') {
- $room->room_wakeup(&$user);
+ $room->room_wakeup($user);
$user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
$user->comm[$user->step % COMM_N] .= 'postact_logout();';
$user->the_end = TRUE;