X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbrisk.phh;h=11f44d2ba592417d06747935f66c01ac5bc8dcde;hb=53f1d7c93385df967eb95ece569aa2144626380b;hp=2a7355c97bc4e6ab0f078d06147d2019da1ec311;hpb=ef0eff447cc1d588c95b9b6bfc5da4cb14ba7af6;p=brisk.git

diff --git a/web/brisk.phh b/web/brisk.phh
index 2a7355c..11f44d2 100644
--- a/web/brisk.phh
+++ b/web/brisk.phh
@@ -28,17 +28,19 @@ define(COMM_N, 12);
 define(COMM_GEN_N, 50);
 define(SESS_LEN, 13);
 define(STREAM_TIMEOUT, 20);
-define(EXPIRE_TIME, 180);
+define(EXPIRE_TIME_RD, 180);
+define(EXPIRE_TIME_SMAMMA, 360); 
 define(GARBAGE_TIMEOUT, 10);
 define(NICKSERV, "<i>SERVER</i>");
 define(BRISK_DEBUG, FALSE);
 // define(DEBUGGING, "local");
 
-$root_wellarr = Array ( 'Benvenuto in brisk (Ver. 0.4.3).',
+$G_brisk_version = "0.4.6";
+
+$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.').',
                         '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 ( 'In bocca al lupo!');
+$table_wellarr = Array ( 'Benvenuto al tavolo.');
 
-$G_brisk_version = "0.4.3";
 
 $G_room_help= '
 <div style=\\"text-align: left; padding: 8px;\\">
@@ -295,6 +297,7 @@ class User {
   var $name;       // name of the user
   var $sess;       // session of the user
   var $lacc;       // last access (for the cleanup)
+  var $laccwr;     // last access (for the cleanup)
   var $stat;       // status (outdoor, room, table, game, ...)
   var $subst;      // substatus for each status   
   var $step;       // step of the current status
@@ -309,7 +312,8 @@ class User {
   function User($name, $sess, $stat = "", $subst = "", $table = -1) {
     $this->name  = $name;
     $this->sess  = $sess;
-    $this->lacc  = time();
+    $this->lacc   = time();
+    $this->laccwr = time();
     $this->stat  = $stat;
     $this->subst  = $subst;
     $this->step  = 1;
@@ -352,15 +356,9 @@ class brisco {
 	if ($user_cur->sess == "")
 	  continue;
 	
-	if ($user_cur->lacc < $curtime) { // Auto logout dell'utente
+	if ($user_cur->lacc + EXPIRE_TIME_RD < $curtime) { // Auto logout dell'utente
 	  log_rd2($user_cur->sess, "AUTO LOGOUT.");
-	  /*
-	  if ($user_cur->stat == 'table') {
-	      log_rd2($user_cur->sess, "AUTO LOGOUT: Yet not implemented in table stat!");
-	      continue;
-	    }
-	  else
-	  */
+
 	  if ($user_cur->stat == 'table' || $user_cur->stat == 'room') {
 	    log_auth($user_cur->sess, "Autologout session.");
 	    
@@ -376,8 +374,15 @@ class brisco {
 	    else
 	      log_rd2($sess, "LOGOUT FROM WHAT ???");
 	  }
-	  //    } // if (0 == 1) 
-	  
+	}
+
+	if ($user_cur->laccwr + EXPIRE_TIME_SMAMMA < $curtime) { // lo rimettiamo in piedi
+	  if ($user_cur->stat == 'room' && $user_cur->subst == 'sitdown') {
+	    $this->room_wakeup(&$user_cur);
+	    $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
+	    $user_cur->comm[$user_cur->step % COMM_N] .=  show_notify("<br>Sei stato inattivo per ".(EXPIRE_TIME_SMAMMA/60.0)." minuti. <br><br>Quindi ritorni tra i <b>Giocatori in piedi</b>.", 0, "torna ai tavoli", 400, 100);
+	    $user_cur->step++;
+	  }
 	}
       }
       log_rd2($user_cur->sess, "GARBAGE UPDATED!");
@@ -392,12 +397,13 @@ class brisco {
     $table_idx = $user->table;
     $table = &$this->table[$table_idx];
 
-    log_main("WAKEUP", "begin function table:".$table_idx);
+    log_main("WAKEUP", "begin function table:".$table_idx."  stat: ".$user->stat."  subst: ".$user->subst);
+
+    $curtime = time();
 
     $from_table = ($user->stat == "table");
     if ($from_table) {
       log_main("WAKEUP", "from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n);
-
       for ($i = 0 ; $i < $table->player_n ; $i++) {
 	$user_cur = &$this->user[$table->player[$i]];
 	log_main("PREIMPOST", "INLOOP name: ".$user_cur->name);
@@ -405,15 +411,21 @@ class brisco {
 	if ($user_cur != $user) {
 	  $user_cur->stat = "room";
 	  $user_cur->subst = "sitdown";
+	  $user_cur->laccwr = $curtime;
 	}
 	else if ($user->sess != "") {
 	  $user_cur->stat = "room";
 	  $user_cur->subst = "standup";
+	  $user_cur->laccwr = $curtime;
 	  $user_cur->table = -1;
 	}
       }
     }
-
+    else {
+      $user->stat = "room";
+      $user->subst = "standup";
+      $user->laccwr = $curtime;
+    }
     /* aggiorna l'array dei giocatori al tavolo. */
     $table->user_rem(&$this, &$user);
 
@@ -424,8 +436,6 @@ class brisco {
       
       log_main("VALORI", "name: ".$user_cur->name."from_table: ".$from_table."  tab: ".$user_cur->table." taix: ".$table_idx."  ucur: ".$user_cur."  us: ".$user);
 
-      // function show_room(&$bri, &$user)
-
       $ret = "gst.st = ".($user_cur->step+1)."; ";
       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");|';
@@ -433,6 +443,8 @@ class brisco {
 	log_main("DOCUMENT.index.php", "from table");
       }
       else if ($user_cur->stat == "room") {
+	log_main("DOCUMENT.index.php", "from table");
+
 	$ret .= table_content($this, $user_cur, $table_idx);
 	$ret .= standup_content($this, $user_cur);
 	
@@ -546,7 +558,13 @@ class brisco {
     if (strncmp($user_mesg, "/nick ", 6) == 0) {
       log_main($user->sess, "chatt_send BEGIN");
 
-      $name_new = str_replace(' ', '_', substr(trim(substr($user_mesg, 6)),0,12));
+      if (($name_new = validate_name(substr($user_mesg, 6))) == FALSE) {
+	  $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
+	  $user->comm[$user->step % COMM_N] .= sprintf('chatt_sub("%s","Il nickname deve contenere almeno una lettera o una cifra.");', $dt.NICKSERV, xcape($name_new));
+	  $user->step++;
+
+	  return;
+      }
       $user_mesg = "COMMAND ".$user_mesg;
       // Search dup name
       // change
@@ -653,6 +671,7 @@ class brisco {
    *
    * 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
    */
@@ -661,6 +680,11 @@ class brisco {
     $idx = -1;
     $idfree = -1;
     
+    if (($name_new = validate_name($name)) == FALSE) {
+      $idx = -2;
+      return (FALSE);
+    }
+
     log_auth("XXX", sprintf("ARRIVA: [%s]", $sess));
     if (validate_sess($sess) == FALSE) 
       $sess = "";
@@ -674,7 +698,7 @@ class brisco {
       if ($idfree == -1 && strcmp("", $this->user[$i]->sess) == 0) {
 	$idfree = $i;
       }
-      if (strcmp($this->user[$i]->name, $name) == 0) {
+      if (strcmp($this->user[$i]->name, $name_new) == 0) {
 	$idx = $i;
 	break;
       }
@@ -682,7 +706,7 @@ class brisco {
     if ($idx == -1)
       $idx = $idfree;
 
-    log_auth("XXX", sprintf("TROVATO A QUESTO PUNTO [%d] sess [%s] name [%s]", $idx, $sess, $name));
+    log_auth("XXX", sprintf("TROVATO A QUESTO PUNTO [%d] sess [%s] name [%s]", $idx, $sess, $name_new));
 
     if ($idx != -1 && $i == MAX_PLAYERS) {
       /* SUCCESS */
@@ -694,11 +718,12 @@ class brisco {
       else {
 	$this->user[$idx]->sess = $sess;
       }
-      $this->user[$idx]->name = $name;
+      $this->user[$idx]->name = $name_new;
       $this->user[$idx]->stat = "room";
       $this->user[$idx]->subst = "standup";
+      $this->user[$idx]->laccwr = time();
       
-      log_main("XXX", sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s]", $idx, $sess, $name));
+      log_main("XXX", sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s]", $idx, $sess, $name_new));
       
       return ($this->user[$idx]);
     }
@@ -1238,6 +1263,11 @@ function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
   if (!$is_again) 
     $ret .= table_wellcome($user);
 
+  if ($is_transition && !$is_again) { // appena seduti al tavolo, play della mucca
+    $ret .= playsound("cow.mp3");
+  }
+
+
   /* CARDS */
   if ($is_transition) { //  && $user->subst ==  "asta" superfluo
     $ret .= "|";
@@ -1475,10 +1505,30 @@ function calculate_points(&$table)
   $table->mult = 1;
 }
 
-function validate_sess($sess) {
+function validate_sess($sess) 
+{
   if (strlen($sess) == SESS_LEN) 
     return (TRUE);
   else
     return (FALSE);
 }
+
+function validate_name($name) 
+{
+  $name_new = str_replace(' ', '_', substr(trim($name),0,12));
+
+  for ($i = 0 ; $i < strlen($name_new) ; $i++) {
+    $c = $name_new[$i];
+    if (($c >= "a" && $c <= "z") || ($c >= "A" && $c <= "Z") || ($c >= "0" && $c <= "9"))
+      return ($name_new);
+  }
+
+  return (FALSE);
+}
+
+function playsound($filename)
+{
+  return (sprintf('playsound("flasou", "%s");', $filename));
+}
+
 ?>