aggiunto *_wellcome per le chat, create user_add e user_rem nella classe table, aggiu...

[brisk.git] / web / brisk.phh

diff --git a/web/brisk.phh b/web/brisk.phh
index 03ec212..899bc89 100644 (file)
--- a/web/brisk.phh
+++ b/web/brisk.phh
@@ -34,9 +34,20 @@ define(NICKSERV, "<i>SERVER</i>");
 define(BRISK_DEBUG, FALSE);
 // define(DEBUGGING, "local");
 
+/*
+$root_wellarr = Array ( '<a href="http://www.google.com">GOOGLE</a>',
+                       'pinollo lanollo',
+                       'rorella liolla' );
+*/
+$root_wellarr = Array ( );
+$table_wellarr = Array ( );
+
 function xcape($s)
 {
-  return (str_replace('\\', '\\\\', str_replace('@', '&#64;', str_replace('|', '&brvbar;', htmlentities($s,ENT_COMPAT,"UTF-8")))));
+  $from = array (   '\\',     '@',        '|' );
+  $to   = array ( '\\\\', '&#64;', '&brvbar;' );
+
+  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')
@@ -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') {
@@ -639,8 +675,28 @@ class brisco {
     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 = "<b>%s</b>: ";',  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()
@@ -891,27 +947,6 @@ function standup_content(&$bri, $user)
   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 = "<b>%s</b>: ";',  xcape($user->name));
-
-      log_main("FROM STANDUP", "NAME: ".$user_cur->name." SENDED: ".$user_cur->comm[$user_cur->step % COMM_N]);
-
-      $user_cur->step++;
-    }
-  }
-}
-
 
 
 
@@ -1057,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 = "<b>%s</b>";', xcape($user->name,ENT_COMPAT,"UTF-8"));
   for ($i = 0 ; $i < TABLES_N ; $i++) {
@@ -1120,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 */
@@ -1138,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);