X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Fbrisk.phh;h=b4b7c2a6de0643abea70d8c118bd555f4cb6774c;hb=4b45ce5afbdd337536a1453b975870c3d24c8716;hp=df0c63166f6b0f07881fae598e61fbbb6b544074;hpb=f55c2d16a38119d63ee03304ea38e7e647ad1f5a;p=brisk.git
diff --git a/web/brisk.phh b/web/brisk.phh
index df0c631..b4b7c2a 100644
--- a/web/brisk.phh
+++ b/web/brisk.phh
@@ -34,9 +34,20 @@ define(NICKSERV, "SERVER");
define(BRISK_DEBUG, FALSE);
// define(DEBUGGING, "local");
+/*
+$root_wellarr = Array ( 'GOOGLE',
+ 'pinollo lanollo',
+ 'rorella liolla' );
+*/
+$root_wellarr = Array ( );
+$table_wellarr = Array ( );
+
function xcape($s)
{
- return (str_replace('\\', '\\\\', str_replace('@', '@', str_replace('|', '¦', htmlentities($s,ENT_COMPAT,"UTF-8")))));
+ $from = array ( '\\', '@', '|' );
+ $to = array ( '\\\\', '@', '¦' );
+
+ return (str_replace($from, $to, htmlentities($s,ENT_COMPAT,"UTF-8")));
}
@@ -219,8 +230,37 @@ class Table {
{
$this->player[$idx] = $player;
}
-}
+ function user_add($idx)
+ {
+ $this->player[$this->player_n] = $idx;
+ $this->player_n++;
+
+ return ($this->player_n - 1);
+ }
+
+ function user_rem(&$bri, &$user)
+ {
+ $tabpos = $user->table_pos;
+
+ /* verifico la consistenza dei dati */
+ if ($bri->user[$this->player[$tabpos]] == $user) {
+
+ /* aggiorna l'array dei giocatori al tavolo. */
+ for ($i = $tabpos ; $i < $this->player_n-1 ; $i++) {
+ $this->player[$i] = $this->player[$i+1];
+ $user_cur = &$bri->user[$this->player[$i]];
+ $user_cur->table_pos = $i;
+ }
+ $this->player_n--;
+ }
+ else {
+ log_main($user->sess, "INCONSISTENCY ON TABLE.");
+ }
+ }
+
+} // End class Table
+
class User {
var $name; // name of the user
var $sess; // session of the user
@@ -343,14 +383,10 @@ class brisco {
}
}
}
+
/* aggiorna l'array dei giocatori al tavolo. */
- for ($i = $user->table_pos ; $i < $table->player_n-1 ; $i++) {
- $table->player[$i] = $table->player[$i+1];
- $user_cur = &$this->user[$table->player[$i]];
- $user_cur->table_pos = $i;
- }
- $this->table[$table_idx]->player_n--;
-
+ $table->user_rem(&$this, &$user);
+
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
$user_cur = &$this->user[$i];
if ($user_cur->sess == '' || $user_cur->stat != 'room')
@@ -480,7 +516,7 @@ class brisco {
if (strncmp($user_mesg, "/nick ", 6) == 0) {
log_main($user->sess, "chatt_send BEGIN");
- $name_new = substr(trim(substr($user_mesg, 6)),0,12);
+ $name_new = str_replace(' ', '_', substr(trim(substr($user_mesg, 6)),0,12));
$user_mesg = "COMMAND ".$user_mesg;
// Search dup name
// change
@@ -511,7 +547,7 @@ class brisco {
continue;
if ($user_cur->stat == 'room') {
if ($user->stat == 'room' && $user->subst == 'standup') {
- standup_update(&$this,&$user);
+ $this->standup_update(&$user);
}
else if ($user->stat == 'room' && $user->subst == 'sitdown' ||
$user->stat == 'table') {
@@ -558,7 +594,109 @@ class brisco {
}
}
}
+
+ function &get_user($sess, &$idx)
+ {
+ GLOBAL $PHP_SELF;
+
+ if (strlen($sess) == SESS_LEN) {
+ for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
+ if (strcmp($sess, $this->user[$i]->sess) == 0) {
+ // find it
+ $idx = $i;
+ return ($this->user[$i]);
+ }
+ }
+ log_main($sess, sprintf("get_user: Wrong sess from page [%s]",$PHP_SELF));
+ // for ($i = 0 ; $i < MAX_PLAYERS ; $i++)
+ // log_main($sess, sprintf("get_user: Wrong sess compared with [%s]",$this->user[$i]->sess));
+ }
+ else {
+ log_main($sess, sprintf("get_user: Wrong strlen [%s]",$sess));
+ }
+ return (FALSE);
+ }
+
+ /*
+ * function &add_user(&$bri, &$sess, &$idx, $name)
+ *
+ * RETURN VALUE:
+ * if ($idx != -1 && ret == FALSE) => duplicated nick
+ * if ($idx == -1 && ret == FALSE) => no space left
+ * if (ret == TRUE) => SUCCESS
+ */
+ function &add_user(&$sess, &$idx, $name)
+ {
+ $idx = -1;
+ $idfree = -1;
+
+ log_auth("XXX", sprintf("ARRIVA: [%s]", $sess));
+ if (validate_sess($sess) == FALSE)
+ $sess = "";
+
+ for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
+ /* free user ? */
+ if (strcmp($sess, $this->user[$i]->sess) == 0) {
+ if ($idx == -1)
+ $idx = $i;
+ }
+ if ($idfree == -1 && strcmp("", $this->user[$i]->sess) == 0) {
+ $idfree = $i;
+ }
+ if (strcmp($this->user[$i]->name, $name) == 0) {
+ $idx = $i;
+ break;
+ }
+ }
+ if ($idx == -1)
+ $idx = $idfree;
+
+ log_auth("XXX", sprintf("TROVATO A QUESTO PUNTO [%d] sess [%s] name [%s]", $idx, $sess, $name));
+
+ if ($idx != -1 && $i == MAX_PLAYERS) {
+ /* SUCCESS */
+ if ($sess == "") {
+ $this->user[$idx]->sess = uniqid("");
+ $sess = $this->user[$idx]->sess;
+
+ }
+ else {
+ $this->user[$idx]->sess = $sess;
+ }
+ $this->user[$idx]->name = $name;
+ $this->user[$idx]->stat = "room";
+ $this->user[$idx]->subst = "standup";
+
+ log_main("XXX", sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s]", $idx, $sess, $name));
+
+ return ($this->user[$idx]);
+ }
+
+ return (FALSE);
+ }
+ function standup_update(&$user)
+ {
+ for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
+ $user_cur = &$this->user[$i];
+ if ($user_cur->sess == '')
+ continue;
+
+ log_main("STANDUP START", $user_cur->stat);
+
+ if ($user_cur->stat == 'room') {
+ $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ".standup_content($this, $user_cur);
+ if ($user_cur == $user)
+ $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('$("myname").innerHTML = "%s: ";', xcape($user->name));
+
+ log_main("FROM STANDUP", "NAME: ".$user_cur->name." SENDED: ".$user_cur->comm[$user_cur->step % COMM_N]);
+
+ $user_cur->step++;
+ }
+ }
+ }
+
+
} // end class brisco
function make_seed()
@@ -715,80 +853,18 @@ function save_data(&$bri)
return ($ret);
}
-function &get_user(&$bri, $sess, &$idx)
-{
- GLOBAL $PHP_SELF;
-
- if (strlen($sess) == SESS_LEN) {
- for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
- if (strcmp($sess, $bri->user[$i]->sess) == 0) {
- // find it
- $idx = $i;
- return ($bri->user[$i]);
- }
- }
- log_main($sess, sprintf("get_user: Wrong sess from page [%s]",$PHP_SELF));
- // for ($i = 0 ; $i < MAX_PLAYERS ; $i++)
- // log_main($sess, sprintf("get_user: Wrong sess compared with [%s]",$bri->user[$i]->sess));
- }
- else {
- log_main($sess, sprintf("get_user: Wrong strlen [%s]",$sess));
- }
- return (FALSE);
-}
-
-/*
- * function &add_user(&$bri, &$sess, &$idx, $name)
- *
- * RETURN VALUE:
- * if ($idx != -1 && ret == FALSE) => duplicated nick
- * if ($idx == -1 && ret == FALSE) => no space left
- * if (ret == TRUE) => SUCCESS
- */
-function &add_user(&$bri, &$sess, &$idx, $name)
-{
- $idx = -1;
-
- for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
- /* free user ? */
- if (strcmp($sess, $bri->user[$i]->sess) == 0) {
- if ($idx == -1)
- $idx = $i;
- }
- if (strcmp($bri->user[$i]->name, $name) == 0) {
- $idx = $i;
- break;
- }
- }
- if ($idx != -1 && $i == MAX_PLAYERS) {
- /* SUCCESS */
- $bri->user[$idx]->sess = uniqid("");
- $sess = $bri->user[$idx]->sess;
- $bri->user[$idx]->name = $name;
- $bri->user[$idx]->stat = "room";
- $bri->user[$idx]->subst = "standup";
-
- log_main("XXX", sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s]", $idx, $sess, $name));
-
- return ($bri->user[$idx]);
- }
- else {
- return (FALSE);
- }
-}
-
function table_act_content($isstanding, $sitted, $table, $cur_table)
{
$ret = "";
if ($isstanding) {
if ($sitted < PLAYERS_N) {
- $ret = sprintf('', $table, $table);
+ $ret = sprintf('', $table, $table);
}
}
else {
if ($table == $cur_table)
- $ret = sprintf('');
+ $ret = sprintf('');
else
$ret = "";
}
@@ -864,34 +940,13 @@ function standup_content(&$bri, $user)
}
$content .= '';
- $content2 = '';
+ $content2 = '';
$ret .= sprintf('$("standup").innerHTML = "%s"; $("esco").innerHTML = "%s";',
$content, $content2);
return ($ret);
}
-function standup_update(&$bri, &$user)
-{
- for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
- $user_cur = &$bri->user[$i];
- if ($user_cur->sess == '')
- continue;
-
- log_main("STANDUP START", $user_cur->stat);
-
- if ($user_cur->stat == 'room') {
- $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ".standup_content($bri, $user_cur);
- if ($user_cur == $user)
- $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('$("myname").innerHTML = "%s: ";', xcape($user->name));
-
- log_main("FROM STANDUP", "NAME: ".$user_cur->name." SENDED: ".$user_cur->comm[$user_cur->step % COMM_N]);
-
- $user_cur->step++;
- }
- }
-}
-
@@ -1037,12 +1092,32 @@ function show_table_info(&$bri, &$table, $table_pos)
return ($ret);
}
+function root_wellcome($user)
+{
+ GLOBAL $root_wellarr;
+
+ for ($i = 0 ; $i < count($root_wellarr) ; $i++)
+ $ret .= sprintf('chatt_sub("ChanServ: ","%s");', str_replace('"', '\"', $root_wellarr[$i]));
+
+ return ($ret);
+}
+
+function table_wellcome($user)
+{
+ GLOBAL $table_wellarr;
+ for ($i = 0 ; $i < count($table_wellarr) ; $i++)
+ $ret .= sprintf('chatt_sub("ChanServ: ","%s");', str_replace('"', '\"', $table_wellarr[$i]));
+
+ return ($ret);
+}
function show_room(&$bri, &$user)
{
$ret .= sprintf('gst.st = %d;', $user->step);
$ret .= sprintf('stat = "%s";', $user->stat);
+
+ $ret .= root_wellcome($user);
$ret .= sprintf('subst = "%s";', $user->subst);
$ret .= sprintf('$("myname").innerHTML = "%s";', xcape($user->name,ENT_COMPAT,"UTF-8"));
for ($i = 0 ; $i < TABLES_N ; $i++) {
@@ -1100,6 +1175,7 @@ function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
/* NOTIFY FOR THE CARD MAKER */
if ($is_transition) { // && $user->subst == "asta" superfluo
$ret .= show_table_info(&$bri, &$table, $user->table_pos);
+ $ret .= table_wellcome($user);
}
/* CARDS */
@@ -1118,7 +1194,7 @@ function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
}
log_rd($sess, "O ".$o." VAL ".$table->card[$o]->value." Owner: ".$table->card[$o]->owner);
- $ret .= sprintf( ' card_send(%d,%d,%d,%f,%d);|', ($table->gstart + $e) % PLAYERS_N,
+ $ret .= sprintf( ' card_send(%d,%d,%d,%8.2f,%d);|', ($table->gstart + $e) % PLAYERS_N,
$i, ((($e + PLAYERS_N - $user->table_pos + $table->gstart) % PLAYERS_N) == 0 ?
$table->card[$o]->value : -1),
($i == 7 && $e == (PLAYERS_N - 1) ? 1 : 0.5),$i+1);
@@ -1339,4 +1415,10 @@ function calculate_points(&$table)
$table->mult = 1;
}
+function validate_sess($sess) {
+ if (strlen($sess) == SESS_LEN)
+ return (TRUE);
+ else
+ return (FALSE);
+}
?>