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

diff --git a/TODO.txt b/TODO.txt
index b1c78a6..9262c27 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,8 +1,7 @@
 /* 
    TODO
 
-   TRIVIAL- aggiungere bottone al login
-   NORM   - wellcome lines in the chats (room and table)
+   NORM WIP - wellcome lines in the chats (room and table)
    URGENT - flash player to play sound
    URGENT - ban temporaneo dai tavoli
    URGENT - smammamorti
@@ -46,6 +45,7 @@
    TO REVIEW - special chars in js
 
    ABORTED bottoni => immagini
+   DONE - aggiungere bottone al login
    DONE - nomi in primo piano se vai sul quadrato   
    DONE - installer to set cookie path
    DONE - change name

diff --git a/web/brisk.phh b/web/brisk.phh
index de21e79..899bc89 100644 (file)
--- a/web/brisk.phh
+++ b/web/brisk.phh
@@ -34,6 +34,14 @@ 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)
 {
   $from = array (   '\\',     '@',        '|' );
@@ -222,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
@@ -346,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')
@@ -1059,19 +1092,22 @@ function show_table_info(&$bri, &$table, $table_pos)
   return ($ret);
 }
 
-
 function root_wellcome($user)
 {
-  //  $ret = sprintf('chatt_sub("BROBRO","BRUBRU");');
-  $ret = "";
+  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)
 {
-  // $ret = sprintf('chatt_sub("TABU","BRUBRU");');
-  $ret = "";
+  GLOBAL $table_wellarr;
+
+  for ($i = 0 ; $i < count($table_wellarr) ; $i++)
+    $ret .= sprintf('chatt_sub("ChanServ: ","%s");', str_replace('"', '\"', $table_wellarr[$i]));
 
   return ($ret);
 }

diff --git a/web/index.php b/web/index.php
index 140b9de..d0f74ca 100644 (file)
--- a/web/index.php
+++ b/web/index.php
@@ -164,6 +164,7 @@ supported by:<br><br>
 Digita il tuo nickname per accedere ai tavoli della briscola.<br><br>
 <form method="post" action="">
 <input id="nameid" name="name" type="text" size="24" maxlength="12" value="">
+<input id="sub"    value="login" type="submit" class="button">
 </form>
 </div>
 </div></div>

diff --git a/web/index_wr.php b/web/index_wr.php
index ca9f78c..c006b25 100644 (file)
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -89,9 +89,7 @@ else if ($user->stat == 'room') {
     // set new status
     $user->subst = "sitdown";
     $user->table = $table_idx;
-    $user->table_pos = $table->player_n;
-    $table->player[$table->player_n] = $idx;
-    $table->player_n++;
+    $user->table_pos = $table->user_add($idx);
                
     if ($table->player_n == PLAYERS_N) {
       // Start game for this table.