X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2FObj%2Fbrisk.phh;h=a1c8f55e470b2d4fa5cc13bc8206fb1b6368a4a6;hb=b6f0a6c9e388dc30cef1f12df3081881b90a6acd;hp=6ee017f103b22fb328aef7c8804617d9a711290f;hpb=20f273872960359ee41ff4b41ea98d017de2d1e5;p=brisk.git

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 6ee017f..a1c8f55 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -27,7 +27,7 @@ define(BRISK_CONF, "brisk.conf.pho");
 define(FTOK_PATH, "/var/lib/brisk");
 define(LEGAL_PATH, "/tmp/legal_brisk");
 define(PROXY_PATH, "/var/lib/brisk_proxy");
-define(TABLES_N, 32);
+define(TABLES_N, 12);
 define(PLAYERS_N, 3);
 define(MAX_POINTS, 5);
 define(MAX_PLAYERS, (20 + (PLAYERS_N * TABLES_N)));
@@ -75,9 +75,9 @@ require_once("$DOCUMENT_ROOT/Etc/".BRISK_CONF);
 $G_false = FALSE;
 
 $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "2.0.0";
+$G_brisk_version = "2.1.0 - trusty";
 
-$root_wellarr = Array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: Nuova versione stabile.',
+$root_wellarr = Array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: Autenticazione e tavoli riservati.',
                         'Se vuoi iscriverti alla <a target="_blank" href="http://www.milug.org/cgi-bin/mailman/listinfo/ml-briscola">Mailing List</a>, cliccala!' );
 $table_wellarr = Array ( 'Benvenuto al tavolo. Se almeno tre giocatori non sbloccano l\'uscita cliccando il lucchetto, chi esce non pu&ograve; risedersi a un qualunque tavolo per '.floor(BAN_TIME/60).' minuti.');
 
@@ -174,7 +174,8 @@ class Table {
   var $mazzo;
   var $gstart;
   var $turn;
-  
+  var $auth_only;
+
   var $wag_own;
   var $wag_com;
   var $wag_tout;
@@ -223,6 +224,9 @@ class Table {
     $thiz->asta_card =  -1;
     $thiz->asta_pnt  =  -1;
     $thiz->mult      =   1;
+    
+    $thiz->auth_only =   FALSE;
+
     $thiz->points    =   array( );
     $thiz->points_n  =   0;
     $thiz->total     =   array( 0, 0, 0, 0, 0);
@@ -265,6 +269,8 @@ class Table {
     $thiz->gstart = $from->gstart;
     $thiz->turn = $from->turn;
 
+    $thiz->auth_only =  $from->auth_only;
+
     $thiz->wag_own   =  $from->wag_own;
     $thiz->wag_com   =  $from->wag_com;
     $thiz->wag_tout  =  $from->wag_taut;
@@ -310,6 +316,8 @@ class Table {
     $thiz->gstart = $from->gstart;
     $thiz->turn = $from->turn;
 
+    $thiz->auth_only =  $from->auth_only;
+
     $thiz->wag_own = $from->wag_own;
     $thiz->wag_com = $from->wag_com;
     $thiz->wag_tout  =  $from->wag_taut;
@@ -528,6 +536,10 @@ class Table {
   }
 } // end class Table
   
+
+// User flags
+define(USER_FLAG_AUTH, 0x02);
+
 class User {
   var $name;       // name of the user
   var $sess;       // session of the user
@@ -547,6 +559,7 @@ class User {
   var $table;      // id of the current table (if in table state)
   var $table_pos;  // idx on the table
   var $table_token;// token that identify a game on a table
+  var $flags;      // Bitfield with: AUTHENTICATE: 0x02 
   var $the_end;    // Flag to change the end of the session
 
   var $chat_lst;      // Last chat line
@@ -578,6 +591,8 @@ class User {
     $thiz->asta_pnt  = -1;
     $thiz->handpt = -1;
     $thiz->exitislock = TRUE;
+
+    $thiz->flags = 0x00;
     
     $thiz->chattime = array_fill(0, CHAT_N, 0);
     $thiz->chat_cur = 0;
@@ -621,6 +636,8 @@ class User {
     $thiz->handpt     = $from->handpt;
     $thiz->exitislock = $from->exitislock;
 
+    $thiz->flags = $from->flags;
+
     $thiz->chattime = array();
     for ($i = 0 ; $i < CHAT_N ; $i++)
       $thiz->chattime[$i] = $from->chattime[$i];
@@ -670,12 +687,15 @@ class User {
     $thiz->exitislock = $from->exitislock;
     $thiz->the_end    = $from->the_end;
 
+    $thiz->flags      = $from->flags;
+
     $thiz->chattime   = array_fill(0, CHAT_N, 0);
     $thiz->chat_cur   = 0;
     $thiz->chat_lst   = "";
     $thiz->chat_ban   = 0;
     $thiz->chat_dlt   = 0;
 
+
     $thiz->table      = $table;
     $thiz->table_pos  = $table_pos;
     $thiz->table_token = $from->table_token;
@@ -806,8 +826,12 @@ class Room {
       $this->user[$i] =& User::create("", "");
     }
 
-    for ($i = 0 ; $i < TABLES_N ; $i++) 
+    for ($i = 0 ; $i < TABLES_N ; $i++) {
       $this->table[$i] =& Table::create();
+      $row = ( (((int)($i / 4)) % 2) == 0 );
+      $col = ($i % 2 == 0);
+      $this->table[$i]->auth_only = (($row && $col) || (!$row && !$col));
+    }
     $this->garbage_timeout = 0;
   }
 
@@ -987,9 +1011,9 @@ class Room {
     $ret .= sprintf('$("myname").innerHTML = "<b>%s</b>";', xcape($user->name));
     for ($i = 0 ; $i < TABLES_N ; $i++) {
       $ret .= $this->table_content($user, $i);
-      $act_content = table_act_content(($user->subst == 'standup'), 
-				     $this->table[$i]->player_n, $i, $user->table);
-      $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $i, $act_content);
+      $ret .= table_act_content(($user->subst == 'standup'), $this->table[$i]->player_n, $i, $user->table, 
+                                ($this->table[$i]->auth_only == FALSE ? TRUE : $user->flags & USER_FLAG_AUTH));
+      // $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $i, $act_content);
       if ($this->table[$i]->wag_own != NULL) 
         $ret .= sprintf('tra.add(%d, "%s: %s"); ', $i,  $this->table[$i]->wag_own->name, $this->table[$i]->wag_com);
       else 
@@ -1057,7 +1081,7 @@ class Room {
 
       $ret = "gst.st = ".($user_cur->step+1)."; ".($remove_wagon ? sprintf("tra.rem(%d);",$table_idx) : "");
       if ($from_table && ($user_cur->table == $table_idx || $user_cur == $user)) {
-	$ret .= 'gst.st_loc++; the_end=true; window.onunload = null; document.location.assign("index.php");|';
+	$ret .= 'gst.st_loc++; the_end=true; window.onunload = null; window.onbeforeunload = null; document.location.assign("index.php");|';
 	// $ret .= 'gst.st_loc++; document.location.assign("index.php");|';
 	log_main("DOCUMENT.index.php: from table");
       }
@@ -1067,8 +1091,8 @@ class Room {
 	$ret .= $this->table_content($user_cur, $table_idx);
 	$ret .= $this->standup_content($user_cur);
 	
-	$act_content = table_act_content(FALSE, 0, $table_idx, $user->table);
-	$ret .= sprintf('$("table_act%d").innerHTML = "%s";', $table_idx, $act_content);
+	$ret .= table_act_content(FALSE, 0, $table_idx, $user->table, FALSE);
+	// $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $table_idx, $act_content);
 	
 	
 	if ($user_cur == $user) {
@@ -1076,13 +1100,17 @@ class Room {
 	  $ret .=  'subst = "standup"; tra.show(); ';
 	  // clean the action buttons in other tables
 	  for ($e = 0 ; $e < TABLES_N ; $e++) {
-	    if ($this->table[$e]->player_n < PLAYERS_N)
-	      $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $e, table_act_content(TRUE, 0, $e, $user->table));
+	    if ($this->table[$e]->player_n < PLAYERS_N) {
+	      // $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $e, table_act_content(TRUE, 0, $e, $user->table));
+	      $ret .= table_act_content(TRUE, 0, $e, $user->table, 
+                                ($this->table[$e]->auth_only == FALSE ? TRUE : $user->flags & USER_FLAG_AUTH));
+            }
 	  }
 	}
 	else {
-	  $act_content = table_act_content(($user_cur->subst == 'standup'), $table->player_n, $table_idx, $user_cur->table);
-	  $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $table_idx, $act_content);
+	  $ret .= table_act_content(($user_cur->subst == 'standup'), $table->player_n, $table_idx, $user_cur->table,
+                                    ($table->auth_only == FALSE ? TRUE : $user_cur->flags & USER_FLAG_AUTH));
+	  // $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $table_idx, $act_content);
 	}
       }
       log_wr("ROOM_WAKEUP: ".$ret);
@@ -1156,8 +1184,10 @@ class Room {
 	$ret .= $this->table_content($user_cur, $table_idx);
 	$ret .= $this->standup_content($user_cur);
 	
-	$act_content = table_act_content(FALSE, 0, $table_idx, $user_cur->table);
-	$ret .= sprintf('$("table_act%d").innerHTML = "%s";', $table_idx, $act_content);
+	$ret .= table_act_content(FALSE, 0, $table_idx, $user_cur->table,
+                                ($table->auth_only == FALSE ? TRUE : $user_cur->flags & USER_FLAG_AUTH));
+
+	// $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $table_idx, $act_content);
 	
 	for ($tab_idx = 0 ; $tab_idx < $user_tab_n  ; $tab_idx++)
 	  if ($user_cur == $user_tab[$tab_idx]) 
@@ -1183,8 +1213,10 @@ class Room {
 	log_main("JOIN_WAKEUP wup_idx ".$wup_idx."  wup_n ".$user_wup_n);
 
 	log_main("JOIN_WAKEUP more");
-	$act_content = table_act_content(($user_cur->subst == 'standup'), $table->player_n, $table_idx, $user_cur->table);
-	$ret .= sprintf('$("table_act%d").innerHTML = "%s";', $table_idx, $act_content);
+	$ret .= table_act_content(($user_cur->subst == 'standup'), $table->player_n, $table_idx, $user_cur->table,
+                                  ($table->auth_only == FALSE ? TRUE : $user_cur->flags & USER_FLAG_AUTH));
+
+	// $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $table_idx, $act_content);
 	log_main("JOIN_WAKEUP end more");
       }
       log_wr("ROOM_JOIN_WAKEUP: ".$ret);
@@ -1264,14 +1296,16 @@ class Room {
 	$ret .=  'subst = "sitdown"; tra.hide(); ';
 	// clean the action buttons in other tables
 	for ($e = 0 ; $e < TABLES_N ; $e++) {
-	  $act_content = table_act_content(FALSE, 0, $e, $user_cur->table);
-	  $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $e, $act_content);
+	  $ret .= table_act_content(FALSE, 0, $e, $user_cur->table, FALSE);
+	  // $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $e, $act_content);
 	}
       }
       else if ($table_idx > -1) {
 	if ($table->player_n == PLAYERS_N) {
-	  $act_content = table_act_content(($user_cur->subst == 'standup'), PLAYERS_N, $table_idx, $user_cur->table);
-	  $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $table_idx, $act_content);
+	  $ret .= table_act_content(($user_cur->subst == 'standup'), PLAYERS_N, $table_idx, $user_cur->table,
+                                ($table->auth_only == FALSE ? TRUE : $user_cur->flags & USER_FLAG_AUTH));
+
+	  // $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $table_idx, $act_content);
 	}
       }
       $user_cur->comm[$user_cur->step % COMM_N] = $ret;
@@ -1379,6 +1413,7 @@ class Room {
         }
       
 	$user->name = $name_new; // OK - nick changed
+        $user->flags &= ~USER_FLAG_AUTH; // Remove auth if name changed
         
         log_main("chatt_send start set");
 
@@ -1528,19 +1563,31 @@ class Room {
     return ($G_false);
   }
 
+  
+
   /*
-   * function &add_user(&$room, &$sess, &$idx, $name, $ip)
+   * function &add_user(&$room, &$sess, &$idx, $name, $pass, $ip)
    *
    * RETURN VALUE:
-   *   if ($idx != -1 && ret == FALSE)  =>  duplicated nick
-   *   if ($idx == -2 && ret == FALSE)  =>  invalid name
-   *   if ($idx == -1 && ret == FALSE)  =>  no space left
-   *   if (ret == TRUE)                 =>  SUCCESS
+   *   if ($idx >  -1    && ret == FALSE)  =>  duplicated nick
+   *   if ($idx == -2    && ret == FALSE)  =>  invalid name
+   *   if ($idx == -3    && ret == FALSE)  =>  wrong password
+   *   if ($idx == -1    && ret == FALSE)  =>  no space left
+   *   if ($idx ==  0    && ret == user)   =>  SUCCESS
+   *   if ($idx == -$idx && ret == user)   =>  SUCCESS (but the login exists in the auth db 
    */
-  function &add_user(&$sess, &$idx, $name, $ip)
+
+
+
+  function &add_user(&$sess, &$idx, $name, $pass, $ip)
   {
     GLOBAL $G_false;
 
+    $idx = 0;
+
+    $authenticate = FALSE;
+    $login_exists = FALSE;
+    $ghost = -1;
     $idx = -1;
     $idfree = -1;
     
@@ -1549,10 +1596,26 @@ class Room {
       return ($G_false);
     }
 
-    log_auth("XXX", sprintf("ARRIVA: [%s]", $sess));
+    log_auth("XXX", sprintf("ARRIVA: [%s] pass:[%s]", $sess, ($pass == FALSE ? "FALSE" : $pass)));
     if (validate_sess($sess) == FALSE) 
       $sess = "";
 
+    /* if pass != FALSE verify the login with pass */
+    log_auth("XXX", "auth1");
+    $userdb = new LoginDB();
+    if ($pass != FALSE) {
+      log_auth("XXX", "auth2");
+      $authenticate = $userdb->login_verify($name_new, $pass);
+      log_auth("XXX", "authenticate: ".($authenticate == TRUE ? "TRUE" : "FALSE"));
+      
+      if ($authenticate == FALSE) {
+        $idx = -3;
+        return ($G_false);
+      }
+    }
+    else {
+      $login_exists =  $userdb->login_exists($name_new);
+    }
     for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
       /* free user ? */
       if (strcmp($sess, $this->user[$i]->sess) == 0) {
@@ -1561,10 +1624,16 @@ class Room {
       }
       if ($idfree == -1 && strcmp("", $this->user[$i]->sess) == 0) {
 	$idfree = $i;
+        continue; // NOTE: CHECK IT !!
       }
-      if (strcmp($this->user[$i]->name, $name_new) == 0) {
-	$idx = $i;
-	break;
+      if (strcasecmp($this->user[$i]->name, $name_new) == 0) {
+	if ($authenticate == FALSE) {
+          $idx = $i;
+          break;
+        }
+        else {
+          $ghost = $i;
+        }
       }
     }
     if ($idx == -1)
@@ -1572,6 +1641,7 @@ class Room {
 
     log_auth("XXX", sprintf("TROVATO A QUESTO PUNTO [%d] sess [%s] name [%s]", $idx, $sess, $name_new));
 
+
     if ($idx != -1 && $i == MAX_PLAYERS) {
       /* SUCCESS */
       $curtime = time();
@@ -1592,9 +1662,47 @@ class Room {
       $this->user[$idx]->laccwr = $curtime;
       $this->user[$idx]->bantime = 0;
       $this->user[$idx]->ip = $ip;
+
+      $this->user[$idx]->flags = ($authenticate ? USER_FLAG_AUTH : 0x00);
+
+      if ($ghost > -1) {
+        log_main("ghost: rename!");
+        $ghost_user =& $this->user[$ghost];
+
+
+        for ($sfx = 1 ; $sfx <= MAX_PLAYERS ; $sfx++) {
+          $ghostname = 'ghost'.$sfx;
+          for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
+            if (strcmp("", $this->user[$i]->sess) == 0) 
+              continue;
+
+            if (strcmp($this->user[$i]->name, $ghostname) == 0) {
+              $ghostname = '';
+              break;
+            }
+          }
+          if ($ghostname != '')
+            break;
+        }
+
+        $ghost_user->name = $ghostname;
+        
+        if ($ghost_user->stat == 'room' && $ghost_user->subst == 'standup') {
+          $this->standup_update(&$ghost_user);
+        }
+        else {
+          log_main("chatt_send pre table update");
+          $this->table_update(&$ghost_user);
+          log_main("chatt_send post table update");
+        }
+      }
+
+
       log_main(sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s]", $idx, $sess, $name_new));
-      
-      return ($this->user[$idx]);
+      $real_idx = $idx;
+      if ($login_exists)
+        $idx = -($idx + 1);
+      return ($this->user[$real_idx]);
     }
 
     return ($G_false);
@@ -1683,7 +1791,6 @@ class Room {
   {
     GLOBAL $sess;
     
-    $ret =   FALSE;
     $shm =   FALSE;
     
     // var_dump($room);
@@ -1711,7 +1818,7 @@ class Room {
     if ($shm)
       shm_detach($shm);
     
-    return ($ret);
+    return (FALSE);
   }
 
   function lock_data()
@@ -1746,6 +1853,7 @@ class Room {
     return (sem_release($res));
   }
 
+
   function standup_content($user)
   {
     $ret = "";
@@ -1760,39 +1868,32 @@ class Room {
       $ct++;
     }
     
-    $content .= sprintf('<table cols=\\"%d\\" class=\\"table_standup\\">', $ct);
+    // $content .= sprintf('<table cols=\\"%d\\" class=\\"table_standup\\">', $ct);
     
+    $content = ' j_stand_cont( [ ';
+
     for ($e = 0 , $ct = 0 ; $e < MAX_PLAYERS ; $e++) {
       if ($this->user[$e]->sess == "" || $this->user[$e]->stat != "room" || $this->user[$e]->name == "")
         continue;
       
+      $flags = $this->user[$e]->flags;
       
       if ($this->user[$e]->subst == "standup") {
-        if (($ct % 4) == 0) {
-          $content .= '<tr>';
-        }
         if ($this->user[$e] == $user) 
-          { $hilion = "<b>"; $hilioff = "</b>"; }
-        else
-          { $hilion = ""; $hilioff = ""; }
+          { 
+            $flags |= 1;
+          }
         
-        $content .= sprintf('<td class=\\"room_standup\\">%s%s%s</td>',$hilion, xcape($this->user[$e]->name), $hilioff);
-        if (($ct % 4) == 3) {
-          $content .= '</tr>';
-        }
+        $content .= sprintf('%s[ %d, \'%s\' ]',($ct > 0 ? ', ' : ''), $flags, xcape($this->user[$e]->name));
         $ct++;
       }
     }
-    $content .= '</table>';
+    $content .= ' ]);';
     
-    $content2 = '<input class=\\"button\\" name=\\"logout\\" value=\\"Esco.\\" onclick=\\"window.onunload = null; act_logout();\\" type=\\"button\\">';
-    $ret .= sprintf('$("standup").innerHTML = "%s";  $("esco").innerHTML = "%s";', 
-                    $content, $content2);
-    
-    return ($ret);
+    return ($content);
   }
   
-  function table_content($user, $table_idx)
+  function table_content_old($user, $table_idx)
   {
     $content = "";
     $ret = "";
@@ -1830,6 +1931,42 @@ class Room {
   }
 
 
+  function table_content($user, $table_idx)
+  {
+    $content = "";
+    $ret = "";
+    // TODO
+    //
+    //   Si possono usare i dati nella classe table
+    //
+    
+    $sess = $user->sess;
+    $table = &$this->table[$table_idx];
+    
+    if ($user->stat != 'room')
+      return;
+    
+    $content = "[ ";
+    for ($i = 0 ; $i < $table->player_n ; $i++) {
+      $user_cur = &$this->user[$table->player[$i]];
+
+      $flags = $user_cur->flags;
+
+      if ($user_cur == $user) 
+        $flags |= 1;
+      
+      log_main($user_cur->name. sprintf(" IN TABLE [%d]", $table_idx));
+      
+      $content .= sprintf('%s[ %d, \'%s\' ]',($i == 0 ? '' : ', '), $flags, xcape($user_cur->name));
+    }
+
+    $content .= ' ]';
+
+    $ret .= sprintf('j_tab_cont(%d, %s);', $table_idx, $content);
+    
+    return ($ret);
+  }
+
 } // end class Room
 
 function make_seed()
@@ -2088,7 +2225,7 @@ function unlock_banlist($res)
   return (sem_release($res));
 }
 
-function table_act_content($isstanding, $sitted, $table, $cur_table)
+function table_act_content_old($isstanding, $sitted, $table, $cur_table)
 {
   $ret = "";
 
@@ -2106,6 +2243,30 @@ function table_act_content($isstanding, $sitted, $table, $cur_table)
   return ($ret);
 }
 
+function table_act_content($isstanding, $sitted, $table, $cur_table, $allowed)
+{
+  $ret = "";
+
+  if ($isstanding) {
+    if ($sitted < PLAYERS_N) {
+      if ($allowed)
+        $act = 'sit';
+      else
+        $act = 'reserved';
+    }
+  }
+  else {
+    if ($table == $cur_table)
+      $act = 'wake';
+    else
+      $act = 'none';
+  }
+
+  if ($act != '')
+    $ret = sprintf('j_tab_act_cont(%d, \'%s\');', $table, $act);
+
+  return ($ret);
+}
 
 function show_notify($text, $tout, $butt, $w, $h)
 {