X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbrisk.phh;h=9db417c7154f9607d55303dce416c95f2d9a7bdf;hb=1437aa24eb931e4c1297401b0f670c6daebdcb9c;hp=de21e7963339ee9e6478774fb76d1a924b05b65f;hpb=42ebc88dcb3930d0f20a09c89a15599335a6b9c5;p=brisk.git

diff --git a/web/brisk.phh b/web/brisk.phh
index de21e79..9db417c 100644
--- a/web/brisk.phh
+++ b/web/brisk.phh
@@ -34,6 +34,23 @@ 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 ( );
+
+$G_brisk_version = "0.4.2";
+
+/*$G_room_help = '
+Brisk - Ver. '.$G_brisk_version.'<br><br>
+Copyright 2006 <a href=\\"mailto:brisk@alternativeoutput.it\\">Matteo Nastasi</a><br><br>';
+*/
+$G_room_help = '<b>Brisk - Ver. '.$G_brisk_version.'</b><br><br>Copyright 2006 <a href=\\"mailto:brisk@alternativeoutput.it\\">Matteo Nastasi</a><br><br>';
+
+
 function xcape($s)
 {
   $from = array (   '\\',     '@',        '|' );
@@ -222,8 +239,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 +392,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')
@@ -483,7 +525,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
@@ -883,7 +925,14 @@ function standup_content(&$bri, $user)
   if ($user->stat != 'room')
     return;
 
-  $content .= '<table class=\\"table_standup\\">';
+  for ($e = 0 , $ct = 0 ; $ct < 4 && $e < MAX_PLAYERS ; $e++) {
+    if ($bri->user[$e]->sess == "" || $bri->user[$e]->stat != "room" || $bri->user[$e]->name == "")
+      continue;
+    $ct++;
+  }
+
+  $content .= sprintf('<table cols=\\"%d\\" class=\\"table_standup\\">', $ct);
+
   for ($e = 0 , $ct = 0 ; $e < MAX_PLAYERS ; $e++) {
     if ($bri->user[$e]->sess == "" || $bri->user[$e]->stat != "room" || $bri->user[$e]->name == "")
       continue;
@@ -898,7 +947,7 @@ function standup_content(&$bri, $user)
       else
 	{ $hilion = ""; $hilioff = ""; }
 
-      $content .= sprintf('<td style=\\"text-align: center\\">%s%s%s</td>',$hilion, xcape($bri->user[$e]->name), $hilioff);
+      $content .= sprintf('<td class=\\"room_standup\\">%s%s%s</td>',$hilion, xcape($bri->user[$e]->name), $hilioff);
       if (($ct % 4) == 3) {
 	$content .= '</tr>';
       }
@@ -918,10 +967,10 @@ function standup_content(&$bri, $user)
 
 
 
-function show_notify($text, $tout, $butt)
+function show_notify($anc, $text, $tout, $butt)
 {
   log_main("SHOW_NOTIFY", $text);
-  return sprintf('var noti = new notify(gst,$("bg"),"%s",%d,"%s");', $text, $tout,$butt);
+  return sprintf('var noti = new notify(gst,$("%s"),"%s",%d,"%s");', $anc, $text, $tout,$butt);
 }
 
 
@@ -1054,24 +1103,27 @@ function show_table_info(&$bri, &$table, $table_pos)
   }
   $noty .= "<hr><br>";
 
-  $ret .= show_notify($noty, 3000, "torna alla partita");
+  $ret .= show_notify("bg", $noty, 3000, "torna alla partita");
   
   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);
 }