corretta gestione stringhe

[brisk.git] / web / brisk.phh

diff --git a/web/brisk.phh b/web/brisk.phh
index 39fd17e..df4c3f1 100644 (file)
--- a/web/brisk.phh
+++ b/web/brisk.phh
@@ -20,7 +20,7 @@
  */
 
 define( FTOK_PATH, "/var/lib/brisk");
-define(TABLES_N, 4);
+define(TABLES_N, 8);
 define(PLAYERS_N, 3);
 define(MAX_POINTS, 5);
 define(MAX_PLAYERS, (PLAYERS_N * TABLES_N));
@@ -36,7 +36,10 @@ define(BRISK_DEBUG, FALSE);
 
 function xcape($s)
 {
-  return (str_replace('\\', '\\\\', str_replace('@', '@', str_replace('|', '¦', htmlentities($s,ENT_COMPAT,"UTF-8")))));
+  $from = array (   '\\',     '@',        '|' );
+  $to   = array ( '\\\\', '@', '¦' );
+
+  return (str_replace($from, $to, htmlentities($s,ENT_COMPAT,"UTF-8")));
 }
 
 
@@ -558,6 +561,88 @@ class brisco {
       }
     }
   }
+
+  function &get_user($sess, &$idx)
+  {
+    GLOBAL $PHP_SELF;
+    
+    if (strlen($sess) == SESS_LEN) {
+      for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
+       if (strcmp($sess, $this->user[$i]->sess) == 0) {
+         // find it
+         $idx = $i;
+         return ($this->user[$i]);
+       }
+      }
+      log_main($sess, sprintf("get_user: Wrong sess from page [%s]",$PHP_SELF));
+      // for ($i = 0 ; $i < MAX_PLAYERS ; $i++) 
+      // log_main($sess, sprintf("get_user: Wrong sess compared with [%s]",$this->user[$i]->sess));
+    }
+    else {
+      log_main($sess, sprintf("get_user: Wrong strlen [%s]",$sess));
+    }
+    return (FALSE);
+  }
+
+  /*
+   * function &add_user(&$bri, &$sess, &$idx, $name)
+   *
+   * RETURN VALUE:
+   *   if ($idx != -1 && ret == FALSE)  =>  duplicated nick
+   *   if ($idx == -1 && ret == FALSE)  =>  no space left
+   *   if (ret == TRUE)                 =>  SUCCESS
+   */
+  function &add_user(&$sess, &$idx, $name)
+  {
+    $idx = -1;
+    $idfree = -1;
+    
+    log_auth("XXX", sprintf("ARRIVA: [%s]", $sess));
+    if (validate_sess($sess) == FALSE) 
+      $sess = "";
+
+    for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
+      /* free user ? */
+      if (strcmp($sess, $this->user[$i]->sess) == 0) {
+       if ($idx == -1)
+         $idx = $i;
+      }
+      if ($idfree == -1 && strcmp("", $this->user[$i]->sess) == 0) {
+       $idfree = $i;
+      }
+      if (strcmp($this->user[$i]->name, $name) == 0) {
+       $idx = $i;
+       break;
+      }
+    }
+    if ($idx == -1)
+      $idx = $idfree;
+
+    log_auth("XXX", sprintf("TROVATO A QUESTO PUNTO [%d] sess [%s] name [%s]", $idx, $sess, $name));
+
+    if ($idx != -1 && $i == MAX_PLAYERS) {
+      /* SUCCESS */
+      if ($sess == "") {
+       $this->user[$idx]->sess = uniqid("");
+       $sess = $this->user[$idx]->sess;
+       
+      }
+      else {
+       $this->user[$idx]->sess = $sess;
+      }
+      $this->user[$idx]->name = $name;
+      $this->user[$idx]->stat = "room";
+      $this->user[$idx]->subst = "standup";
+      
+      log_main("XXX", sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s]", $idx, $sess, $name));
+      
+      return ($this->user[$idx]);
+    }
+
+    return (FALSE);
+  }
+  
+
   
 } // end class brisco
 
@@ -715,80 +800,18 @@ function save_data(&$bri)
   return ($ret);
 }
 
-function &get_user(&$bri, $sess, &$idx)
-{
-  GLOBAL $PHP_SELF;
-
-  if (strlen($sess) == SESS_LEN) {
-    for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
-      if (strcmp($sess, $bri->user[$i]->sess) == 0) {
-       // find it
-       $idx = $i;
-       return ($bri->user[$i]);
-      }
-    }
-    log_main($sess, sprintf("get_user: Wrong sess from page [%s]",$PHP_SELF));
-    // for ($i = 0 ; $i < MAX_PLAYERS ; $i++) 
-    // log_main($sess, sprintf("get_user: Wrong sess compared with [%s]",$bri->user[$i]->sess));
-  }
-  else {
-    log_main($sess, sprintf("get_user: Wrong strlen [%s]",$sess));
-  }
-  return (FALSE);
-}
-
-/*
- * function &add_user(&$bri, &$sess, &$idx, $name)
- *
- * RETURN VALUE:
- *   if ($idx != -1 && ret == FALSE)  =>  duplicated nick
- *   if ($idx == -1 && ret == FALSE)  =>  no space left
- *   if (ret == TRUE)                 =>  SUCCESS
- */
-function &add_user(&$bri, &$sess, &$idx, $name)
-{
-  $idx = -1;
-
-  for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
-    /* free user ? */
-    if (strcmp($sess, $bri->user[$i]->sess) == 0) {
-      if ($idx == -1)
-       $idx = $i;
-    }
-    if (strcmp($bri->user[$i]->name, $name) == 0) {
-      $idx = $i;
-      break;
-    }
-  }
-  if ($idx != -1 && $i == MAX_PLAYERS) {
-    /* SUCCESS */
-    $bri->user[$idx]->sess = uniqid("");
-    $sess = $bri->user[$idx]->sess;
-    $bri->user[$idx]->name = $name;
-    $bri->user[$idx]->stat = "room";
-    $bri->user[$idx]->subst = "standup";
-
-    log_main("XXX", sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s]", $idx, $sess, $name));
-      
-    return ($bri->user[$idx]);
-  }
-  else {
-    return (FALSE);
-  }
-}
-
 function table_act_content($isstanding, $sitted, $table, $cur_table)
 {
   $ret = "";
 
   if ($isstanding) {
     if ($sitted < PLAYERS_N) {
-      $ret = sprintf('<input type=\\"button\\" name=\\"xhenter%d\\"  value=\\"Mi siedo.\\" onclick=\\"act_sitdown(%d);\\">', $table, $table);
+      $ret = sprintf('<input type=\\"button\\" class=\\"button\\" name=\\"xhenter%d\\"  value=\\"Mi siedo.\\" onclick=\\"act_sitdown(%d);\\">', $table, $table);
     }
   }
   else {
     if ($table == $cur_table)
-      $ret = sprintf('<input type=\\"button\\" name=\\"xwakeup\\"  value=\\"Mi alzo.\\" onclick=\\"act_wakeup();\\">');
+      $ret = sprintf('<input type=\\"button\\" class=\\"button\\" name=\\"xwakeup\\"  value=\\"Mi alzo.\\" onclick=\\"act_wakeup();\\">');
     else
       $ret = "";
   }
@@ -822,8 +845,10 @@ function table_content($bri, $user, $table_idx)
     
     $content .= sprintf("%s%s%s<br>",$hilion, xcape($user_cur->name), $hilioff);
   }
+  /*
   for ( ; $i < PLAYERS_N ; $i++)
     $content .= "<br>";
+  */
 
   $ret .= sprintf('$("table%d").innerHTML = "%s";', $table_idx, $content);
   
@@ -838,7 +863,7 @@ function standup_content(&$bri, $user)
   if ($user->stat != 'room')
     return;
 
-  $content .= '<table width=\\"100%\\">';
+  $content .= '<table class=\\"table_standup\\">';
   for ($e = 0 , $ct = 0 ; $e < MAX_PLAYERS ; $e++) {
     if ($bri->user[$e]->sess == "" || $bri->user[$e]->stat != "room" || $bri->user[$e]->name == "")
       continue;
@@ -862,9 +887,9 @@ function standup_content(&$bri, $user)
   }
   $content .= '</table>';
        
-  $content .= '<div class=\\"esco\\"><input name=\\"logout\\" value=\\"Esco.\\" onclick=\\"window.onunload = null; act_logout();\\" type=\\"button\\"></div>';
-
-  $ret .= sprintf('$("standup").innerHTML = "%s";', $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);
 }
@@ -1337,4 +1362,10 @@ function calculate_points(&$table)
   $table->mult = 1;
 }
 
+function validate_sess($sess) {
+  if (strlen($sess) == SESS_LEN) 
+    return (TRUE);
+  else
+    return (FALSE);
+}
 ?>