X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=ed630cebf734b6efbfb7bd1e94f27b4eae86d217;hb=9b4aaeb974e7f92e6e124bde29c78a1f5f8fb2b0;hp=9802e4f34cc4a2f42d00041bfd5aeff77e2cba15;hpb=a00b90507135651af999d563310a85faf82b4463;p=brisk.git

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 9802e4f..ed630ce 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -2,7 +2,7 @@
 /*
  *  brisk - brisk.phh
  *
- *  Copyright (C) 2006-2009 Matteo Nastasi
+ *  Copyright (C) 2006-2011 Matteo Nastasi
  *                          mailto: nastasi@alternativeoutput.it 
  *                                  matteo.nastasi@milug.org
  *                          web: http://www.alternativeoutput.it
@@ -28,6 +28,7 @@ define(FTOK_PATH, "/var/lib/brisk");
 define(LEGAL_PATH, "/tmp/legal_brisk");
 define(PROXY_PATH, "/var/lib/brisk_proxy");
 define(TABLES_N, 36);
+define(TABLES_AUTH_N, 4);
 define(PLAYERS_N, 3);
 define(MAX_POINTS, 5);
 define(MAX_PLAYERS, (20 + (PLAYERS_N * TABLES_N)));
@@ -52,6 +53,7 @@ define(BAN_TIME, 3600);
 define(GARBAGE_TIMEOUT, 10);
 define(NICKSERV, "<i>BriskServ</i>");
 
+
 define(DBG_ONL2, 0x0001);
 define(DBG_ONLY, 0x0002);
 define(DBG_MAIN, 0x0004);
@@ -63,6 +65,7 @@ define(DBG_WRIT, 0x0080);
 define(DBG_LOAD, 0x0100);
 define(DBG_AUTH, 0x0200);
 define(DBG_CRIT, 0x0400);
+define(DBG_LMOP, 0x0800);
 
 // NOTE: BRISK DEBUG must be a numerical constant, not the result of operations on symbols 
 define(BRISK_DEBUG, 0xffffffbf);
@@ -103,16 +106,21 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi',
                                            'en' => 'The nickname have to contain at least one letter or one number.'),
                       'nickdupl' => array( 'it' => 'Nickname <b>%s</b> gi&agrave; in uso.',
                                            'en' => 'The nickname <b>%s</b> is already in use.'),
-                      'authchan' => array( 'it' => '<b>Non puoi cambiare nick a un tavolo per soli autenticati.</b>',
-                                           'en' => '<b>You can\'t change your nickname into a table for only authenticated.</b>'),
+                      'authchan' => array( 'it' => '<b>Non puoi cambiare nick a un tavolo per soli autenticati o se sei in modalità isolata.</b>',
+                                           'en' => '<b>You can\'t change your nickname into a table for only authenticated or if you are in isolation mode.</b>'),
                       'nickjust' => array( 'it' => 'Il nickname <b>\'%s\'</b> &egrave; gi&agrave; registrato, <b>se il suo proprietario si autentificher&agrave; verrai rinominato d\'ufficio come ghost<i>N</i>.</b>',
                                            'en' => 'The nickname <b>\'%s\'</b> is already registered, <b>if its proprietary will authenticate you will named again officially ghost<i>N</i>.</b>'), // FIXME: him ???
                       'statunkn' => array( 'it' => 'Questo stato non esiste.',
                                            'en' => 'This state don\'t exists.'),
                       'tabincon' => array( 'it' => '<br>I dati del tavolo n&deg; %d sono inconsistenti, verranno resettati.<br><br>Torni in piedi.<br><br>',
                                            'en' => 'EN <br>I dati del tavolo n&deg; %d sono inconsistenti, verranno resettati.<br><br>Torni in piedi.<br><br>'),
+                      'listmust' => array( 'it' => '<b>Per andare in isolamento non bisogna essere seduti a tavoli non riservati.</b>',
+                                           'en' => '<b>To go to isolation you must don\'t stay on not reserved tables</b>'),
+
                       'tit_onauth'=>array( 'it' => '(solo aut.)',
                                            'en' => '(only aut.)'),
+                      'tit_onisol'=>array( 'it' => '(isolam.to)',
+                                           'en' => '(isolation)')
                       
 
 );
@@ -121,13 +129,13 @@ $G_false = FALSE;
 $G_lng = langtolng($G_lang);
 
 $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "2.1.9 - trusty";
+$G_brisk_version = "2.5.0";
 
 /* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: bug della carta coperta risolto, assenso all\'apertura del tavolo non revocabile, multi-lingua quasi ultimato.',
-                                       'Se vuoi iscriverti alla <a target="_blank" href="http://www.milug.org/cgi-bin/mailman/listinfo/ml-briscola">Mailing List</a>, cliccala!' ),
-                       'en' => array ( 'EN Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: EN Sponsor alternati, menù rivisto, AUTO-GARANZIE, sondaggi quasi ultimati.',
-                                       'EN Se vuoi iscriverti alla <a target="_blank" href="http://www.milug.org/cgi-bin/mailman/listinfo/ml-briscola">Mailing List</a>, cliccala!' ) );
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: informazioni al tavolo sul chiamante, nuovo stato di supporter del sito.',
+                                       'Se vuoi iscriverti alla <a target="_blank" href="mailto:ml-briscola+subscribe@milug.org">Mailing List</a>, cliccala!' ),
+                       'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NEWS</b>: caller information on the table, new supporter status.',
+                                       'If you want to subscribe our <a target="_blank" href="ml-briscola+subscribe@milug.org">Mailing List</a>, click it!' ) );
 
 $G_room_help = array( 'it' => '
 <div style=\\"text-align: left; padding: 8px;\\">
@@ -201,6 +209,7 @@ Attualmente ci sono due metodi per ottenere una password sul sito:<br><br>
 <dir>
 <li>Carta Regionale dei Servizi della Lombardia (la tessera sanitaria)
 <li>Carta Regionale dei Servizi del Friuli Venezia Giulia (la tessera sanitaria)
+<li>Smart card di InfoCamere
 </dir>
 <br>
 <b>Per auto-garantisi occorre possedere:</b><br><br>
@@ -268,6 +277,21 @@ Copyright 2006-2009 <a href=\\"mailto:brisk@alternativeoutput.it\\">Matteo Nasta
 <br><b>version '.$G_brisk_version.'</b><br><br>
 Copyright 2006-2009 <a href=\\"mailto:brisk@alternativeoutput.it\\">Matteo Nastasi</a> (aka mop)<br><br>');
 
+$escinp_from = array( "\""     );
+$escinp_to = array(   "&quot;" );
+
+function escinput($s)
+{
+    GLOBAL $escinp_from, $escinp_to;
+    
+    return str_replace($escinp_from, $escinp_to, $s);
+}
+
+function eschtml($s)
+{
+    return htmlentities($s);
+}
+
 
 function langtolng($lang)
 {
@@ -281,20 +305,22 @@ function csplitter($in, $sep)
   $st = 0;
   $id = 0;
   $out = array();
-
+  $out[$id] = "";
   for ($i = 0 ; $i < strlen($in) ; $i++) {
+    $ini = substr($in, $i, 1);
     if ($st == 0) {
-      if ($in{$i} == '\\')
+      if ($ini == '\\')
         $st = 1;
-      else if ($in{$i} == $sep) {
+      else if ($ini == $sep) {
         $id++;
+        $out[$id] = "";
       }
       else {
-        $out[$id] .= $in{$i};
+        $out[$id] .= $ini;
       }
     }
     else if ($st == 1) {
-      $out[$id] .= $in{$i};
+      $out[$id] .= $ini;
       $st = 0;
     }
   }
@@ -302,7 +328,6 @@ function csplitter($in, $sep)
   return ($out);
 }
 
-
 function xcape($s)
 {
   $from = array (   '\\',     '@',        '|' );
@@ -396,7 +421,7 @@ class Table {
     $this->wakeup_time = $from->wakeup_time;
   }
 
-  function &clone(&$from)
+  function &myclone(&$from)
   {
     GLOBAL $G_false;
     
@@ -540,7 +565,11 @@ class Table {
 
 // User flags
 define(USER_FLAG_AUTH,     0x02);
+
+define(USER_FLAG_MAP_AUTH, 0x0c);
+
 define(USER_FLAG_LISTAUTH, 0x04);
+define(USER_FLAG_ISOLAUTH, 0x08);
 
 //   user status
 define(USER_FLAG_S_NORM,  0x000); // done
@@ -551,9 +580,21 @@ define(USER_FLAG_S_EAT,   0x400); // done
 define(USER_FLAG_S_WRK,   0x500); // done
 define(USER_FLAG_S_SMK,   0x600); // done
 define(USER_FLAG_S_EYE,   0x700); // done
+define(USER_FLAG_S_RABB,  0x800); // done
+define(USER_FLAG_S_SOCC,  0x900); // done
+define(USER_FLAG_S_BABY,  0xa00); // done
+define(USER_FLAG_S_MOP,   0xb00); // done
 
 define(USER_FLAG_S_ALL,   0xf00); // done
 
+/* type of user normal, supporter etc ... */
+define(USER_FLAG_TY_ALL,     0xff0000); // done
+define(USER_FLAG_TY_NORM,    0x010000); // done
+define(USER_FLAG_TY_SUPER,   0x020000); // done
+//  ... other usefull status ...
+define(USER_FLAG_TY_SUSPEND, 0x400000); // done
+define(USER_FLAG_TY_DISABLE, 0x800000); // done
+
 class User {
   var $name;       // name of the user
   var $sess;       // session of the user
@@ -672,7 +713,7 @@ class User {
   }
 
 
-  function &clone(&$from)
+  function &myclone(&$from)
   {
     GLOBAL $G_false;
     
@@ -874,7 +915,7 @@ class Room {
         $this->table[$i]->auth_only = FALSE;
       }
       */
-      if ($i < 12) 
+      if ($i < TABLES_AUTH_N) 
         $this->table[$i]->auth_only = TRUE;
       else
         $this->table[$i]->auth_only = FALSE;
@@ -884,7 +925,7 @@ class Room {
 
   function garbage_manager($force)
   {
-    GLOBAL $G_lang, $mlang_brisk;
+    GLOBAL $G_lang, $mlang_brisk, $G_base;
 
     $ismod = FALSE;
 
@@ -895,7 +936,7 @@ class Room {
     if ($force || $this->garbage_timeout < $curtime) {
       
       // FIXME BRISK4: include for each kind of table
-      require_once("briskin5/Obj/briskin5.phh");
+      require_once("${G_base}briskin5/Obj/briskin5.phh");
 
       // Before all align times with table timeout
       for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) {
@@ -1055,7 +1096,10 @@ class Room {
     
     $ret = sprintf('gst.st = %d; ',  $user_step);
 
-    if ($user->flags & USER_FLAG_LISTAUTH) {
+    if ($user->flags & USER_FLAG_ISOLAUTH) {
+      $ret .= 'list_set(\'isolation\', false, \''.$mlang_brisk['tit_onisol'][$G_lang].'\' ); ';
+    }
+    else if ($user->flags & USER_FLAG_LISTAUTH) {
       $ret .= 'list_set(\'auth\', false, \''.$mlang_brisk['tit_onauth'][$G_lang].'\' ); ';
     }
     else {
@@ -1075,6 +1119,7 @@ class Room {
     $itou = ($user->flags & USER_FLAG_AUTH ? "</i>" : "");
     $ret .= sprintf('$("myname").innerHTML = "<b>%s%s%s</b>";', $itin, xcape($user->name), $itou);
     for ($i = 0 ; $i < TABLES_N ; $i++) {
+
       $ret .= $this->table_content($user, $i);
       // $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));
@@ -1142,7 +1187,7 @@ class Room {
       if ($user_cur->sess == '' || $user_cur->stat != 'room')
 	continue;
       
-      log_main("VALORI: name: ".$user_cur->name."from_table: ".$from_table."  tab: ".$user_cur->table." taix: ".$table_idx."  ucur: ".$user_cur."  us: ".$user);
+      // log_main("VALORI: name: ".$user_cur->name."from_table: ".$from_table."  tab: ".$user_cur->table." taix: ".$table_idx."  ucur: ".$user_cur."  us: ".$user);
 
       $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)) {
@@ -1239,7 +1284,7 @@ class Room {
       }
 
       log_main("___");
-      log_main("VALORI name: ".$user_cur->name."  tab: ".$user_cur->table." taix: ".$table_idx."  ucur: ".$user_cur."  us: ".$user);
+      log_main("VALORI name: ".$user_cur->name."  tab: ".$user_cur->table." taix: ".$table_idx);
 
       $ret = "gst.st = ".($user_cur->step+1)."; ".($remove_wagon ? sprintf("tra.rem(%d);",$table_idx) : "");
       if ($user_cur->stat == "room") {
@@ -1380,7 +1425,7 @@ class Room {
 
   function chatt_send(&$user, $mesg)
   {
-    GLOBAL $G_alarm_passwd, $mlang_brisk, $G_lang;
+    GLOBAL $G_base, $G_alarm_passwd, $mlang_brisk, $G_lang;
     $only_you = FALSE;
     
     // common settings
@@ -1397,6 +1442,7 @@ class Room {
     $to_room     = FALSE;
     $to_tabl     = FALSE;
     $is_normchat = FALSE;
+    /* for old isolation management $is_ticker   = FALSE; */
     $update_room = FALSE;
 
     if (strcmp($msg,  "/tav") == 0 || 
@@ -1435,7 +1481,7 @@ class Room {
         $table->wag_set($user, $msg);
         $to_user = sprintf('tra.add(%d, "%s");', $user->table, xcape(sprintf("%s: %s", $user->name, $msg)));
         $to_room = $to_user;
-        
+        /* for old isolation management $is_ticker = TRUE; */
       } while (0);
     } // /tav chat command
 
@@ -1473,13 +1519,35 @@ class Room {
     else if (strncmp($msg, "/listen ", 8) == 0) {
       $arg = substr($msg, 8);
 
-      if (strcasecmp($arg, "auth") == 0) {
+      if (strcasecmp($arg, "isolation") == 0) {
+        $flags_old = 0;
+        if ($user->stat == 'room' && $user->subst == 'sitdown' &&
+            $user->table >= TABLES_AUTH_N) {
+          $to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_brisk['listmust'][$G_lang]);
+          
+        }
+        else {
+          $user->flags &= ~USER_FLAG_MAP_AUTH;
+          $user->flags |= USER_FLAG_ISOLAUTH;
+          $to_user = 'list_set(\'isolation\', true, \''.$mlang_brisk['tit_onisol'][$G_lang].'\'); ';
+        }
+      }
+      else if (strcasecmp($arg, "auth") == 0) {
+        $flags_old = $user->flags;
+        $user->flags &= ~USER_FLAG_MAP_AUTH;
         $user->flags |= USER_FLAG_LISTAUTH;
         $to_user = 'list_set(\'auth\', true, \''.$mlang_brisk['tit_onauth'][$G_lang].'\'); ';
       }
       else {
-        $user->flags &= ~USER_FLAG_LISTAUTH;
+        $flags_old = $user->flags;
+        $user->flags &= ~USER_FLAG_MAP_AUTH;
         $to_user = 'list_set(\'all\', true, \'\'); ';
+        
+      }
+      // if from isolation redraw standup area
+      if (($flags_old ^ $user->flags) & USER_FLAG_ISOLAUTH) {
+        $to_user .= 'standup_data_old = null; '.$this->standup_content($user);
+        
       }
     }
     else if (strcmp($msg, "/authreq") == 0) {
@@ -1527,8 +1595,12 @@ class Room {
         /* MLANG: "<b>Non puoi cambiare nick a un tavolo per soli autenticati.</b>", "Il nickname <b>\'%s\'</b> &egrave; gi&agrave; registrato, <b>se il suo proprietario si autentificher&agrave; verrai rinominato d\'ufficio come ghost<i>N</i>.</b>" */
         if ($user->flags & USER_FLAG_AUTH) {
           if (strcasecmp($user->name,$name_new) != 0) {
-            if ($user->subst == 'standup' || ($user->subst != 'standup' && $this->table[$user->table]->auth_only == FALSE)) {
-              $user->flags &= ~USER_FLAG_AUTH; // Remove auth if name changed
+             if (( ($user->flags & USER_FLAG_MAP_AUTH) != USER_FLAG_ISOLAUTH) &&
+                ($user->subst == 'standup' || 
+                 ($user->subst != 'standup' && $this->table[$user->table]->auth_only == FALSE)
+                 )
+                ) {
+              $user->flags &= ~(USER_FLAG_AUTH | USER_FLAG_TY_ALL); // Remove auth if name changed
               for ($i = 0 ; $i < TABLES_N ; $i++) {
                 $to_user .= $this->table[$i]->act_content($user);
               }
@@ -1586,6 +1658,18 @@ class Room {
         else if (strcasecmp($st_str, "presente") == 0) {
           $st = USER_FLAG_S_EYE;
         }
+        else if (strcasecmp($st_str, "coniglio") == 0) {
+          $st = USER_FLAG_S_RABB;
+        }
+        else if (strcasecmp($st_str, "calcio") == 0) {
+          $st = USER_FLAG_S_SOCC;
+        }
+        else if (strcasecmp($st_str, "pupo") == 0) {
+          $st = USER_FLAG_S_BABY;
+        }
+        else if (strcasecmp($st_str, "pulizie") == 0) {
+          $st = USER_FLAG_S_MOP;
+        }
         else {
           /* MLANG: "Questo stato non esiste." */
           $to_user = sprintf('chatt_sub("%s", [2,"%s"],"%s");', $dt, NICKSERV, $mlang_brisk['statunkn'][$G_lang]);
@@ -1663,13 +1747,21 @@ class Room {
           continue;
         
         if ($is_normchat == TRUE) {
-          if ($user_cur->flags & USER_FLAG_LISTAUTH) {
+          // use MAP_AUTH to check if auth or isolation
+          if ($user_cur->flags & USER_FLAG_MAP_AUTH) {
             if (($user->flags & USER_FLAG_AUTH) == 0) {
               continue;
             }
           }
         }
-  
+        /*
+        else if ($is_ticker) {
+          if (($user_cur->flags & USER_FLAG_MAP_AUTH) == USER_FLAG_ISOLAUTH) {
+            if ($user->table >= TABLES_AUTH_N)
+              continue;
+          }
+        }
+        */
         $user_cur->comm[$user_cur->step % COMM_N] =  "gst.st = ".($user_cur->step+1)."; ";
         $user_cur->comm[$user_cur->step % COMM_N] .= $to_room; 
         $user_cur->step_inc();
@@ -1678,7 +1770,7 @@ class Room {
     
     if ($to_tabl) {
       // FIXME BRISK4: include for each kind of table
-      require_once("briskin5/Obj/briskin5.phh");
+      require_once("${G_base}briskin5/Obj/briskin5.phh");
       // Before all align times with table timeout
       for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) {
         $table_cur =& $this->table[$table_idx];
@@ -1775,11 +1867,12 @@ class Room {
 
   function &add_user(&$sess, &$idx, $name, $pass, $ip)
   {
-    GLOBAL $G_false, $CO_list;
+    GLOBAL $G_base, $G_false, $CO_list;
 
     $idx = 0;
 
     $authenticate = FALSE;
+    $user_type    = 0;
     $login_exists = FALSE;
     $ghost = -1;
     $ghost_auth = FALSE;
@@ -1801,11 +1894,14 @@ class Room {
     if ($pass != FALSE) {
       log_auth("XXX", "auth2");
       $authenticate = $userdb->login_verify($name_new, $pass);
-      log_auth("XXX", "authenticate: ".($authenticate == TRUE ? "TRUE" : "FALSE"));
+      log_auth("XXX", "authenticate: ".($authenticate != FALSE ? "TRUE" : "FALSE"));
       
-      if ($authenticate == FALSE) {
-        $idx = -3;
-        return ($G_false);
+      if ($authenticate != FALSE) {
+          $user_type = $authenticate->typeget();
+      }
+      else {
+          $idx = -3;
+          return ($G_false);
       }
     }
     else {
@@ -1822,14 +1918,14 @@ class Room {
         continue; // NOTE: CHECK IT !!
       }
       if (strcasecmp($this->user[$i]->name, $name_new) == 0) {
-	if ($authenticate == FALSE) {
-          $idx = $i;
-          break;
-        }
-        else {
-          $ghost = $i;
-          $ghost_auth = ($this->user[$i]->flags & USER_FLAG_AUTH);
-        }
+          if ($authenticate != FALSE) {
+              $ghost = $i;
+              $ghost_auth = ($this->user[$i]->flags & USER_FLAG_AUTH);
+          }
+          else {
+              $idx = $i;
+              break;
+          }
       }
     }
     if ($idx == -1)
@@ -1837,7 +1933,7 @@ class Room {
 
     log_auth("XXX", sprintf("TROVATO A QUESTO PUNTO [%d] sess [%s] name [%s]", $idx, $sess, $name_new));
 
-    if ($ghost > -1 && $ghost_auth && $authenticate) {
+    if ($ghost > -1 && $ghost_auth && ($authenticate != FALSE)) {
       /* swap session */
 
       $ghost_user =& $this->user[$ghost];
@@ -1855,7 +1951,7 @@ class Room {
       $table_idx = $ghost_user->table;
       if ($ghost_user->stat == "table" && $this->table[$table_idx]->player_n == PLAYERS_N) {
         // FIXME BRISK4: include for each kind of table
-        require_once("briskin5/Obj/briskin5.phh");
+        require_once("${G_base}briskin5/Obj/briskin5.phh");
         if (($brisem = Briskin5::lock_data($table_idx)) != FALSE) { 
           if (($bri = &Briskin5::load_data($table_idx)) != FALSE) {
             if ($bri->the_end != TRUE) {
@@ -1891,13 +1987,26 @@ class Room {
       $this->user[$idx]->bantime = 0;
       $this->user[$idx]->ip = $ip;
 
-      $this->user[$idx]->flags = ($authenticate ? USER_FLAG_AUTH : 0x00);
+      $this->user[$idx]->flags = ($authenticate != FALSE ? USER_FLAG_AUTH : 0x00) | $user_type;
+
+      log_auth("XXX", sprintf("FLAGS: [%x]", $this->user[$idx]->flags));
+
       
-      if ($authenticate) {
+      if ($authenticate != FALSE) {
         $this->user[$idx]->flags |= USER_FLAG_LISTAUTH;
 
-        if (isset($CO_list) && strcmp($CO_list, "all") == 0) {
-          $this->user[$idx]->flags &= ~USER_FLAG_LISTAUTH;
+        if (isset($CO_list)) {
+          if (strcmp($CO_list, "auth") == 0) {
+            $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH;
+            $this->user[$idx]->flags |= USER_FLAG_LISTAUTH;
+          }
+          if (strcmp($CO_list, "isolation") == 0) {
+            $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH;
+            $this->user[$idx]->flags |= USER_FLAG_ISOLAUTH;
+          }
+          else {
+            $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH;
+          }
         }
       }
       
@@ -1940,11 +2049,13 @@ class Room {
         }
       } //  if ($ghost > -1) {
 
-      log_main(sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s]", $idx, $sess, $name_new));
       $real_idx = $idx;
       if ($login_exists)
         $idx = -($idx + 1);
-      return ($this->user[$real_idx]);
+      log_main(sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s] count [%d] [%s]", $idx, $sess, $name_new, count($this->user),$this->user[$real_idx]->name));
+
+      $ret = $this->user[$real_idx];
+      return ($ret);
     }
 
     return ($G_false);
@@ -2182,8 +2293,29 @@ function make_seed()
 }
 
 
+function log_mop($step, $log) {
+  GLOBAL $sess, $PHP_SELF;
+
+  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LMOP) == 0)
+    return;
+
+  if (isset($sess) == FALSE)
+    $ssess = "XXXX";
+  else
+    $ssess = $sess;
+
+  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LMOP) == 0)
+    return;
+
+  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+    fwrite($fp, sprintf("LMOP: [%f] [%05d] [%s] [%s]\n", gettimeofday(TRUE), $step, $PHP_SELF, $log));
+    fclose($fp);
+  }
+}
+
+
 function log_only2($log) {
-  GLOBAL $sess;
+  GLOBAL $sess, $PHP_SELF;
 
   if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONL2) == 0)
     return;
@@ -2197,13 +2329,13 @@ function log_only2($log) {
     return;
 
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("ONL2: [%s] [%s]\n", $ssess, $log));
+    fwrite($fp, sprintf("ONL2: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log));
     fclose($fp);
   }
 }
 
 function log_crit($log) {
-  GLOBAL $sess;
+  GLOBAL $sess, $PHP_SELF;
 
   if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_CRIT) == 0)
     return;
@@ -2217,13 +2349,13 @@ function log_crit($log) {
     return;
 
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("CRIT: [%s] [%s]\n", $ssess, $log));
+    fwrite($fp, sprintf("CRIT: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log));
     fclose($fp);
   }
 }
 
 function log_only($log) {
-  GLOBAL $sess;
+  GLOBAL $sess, $PHP_SELF;
 
   if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONLY) == 0)
     return;
@@ -2237,13 +2369,13 @@ function log_only($log) {
     return;
 
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("ONLY: [%s] [%s]\n", $ssess, $log));
+    fwrite($fp, sprintf("ONLY: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log));
     fclose($fp);
   }
 }
 
 function log_main($log) {
-  GLOBAL $sess;
+    GLOBAL $sess, $PHP_SELF;
 
   if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_MAIN) == 0)
     return;
@@ -2257,13 +2389,13 @@ function log_main($log) {
     return;
 
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("MAIN: [%s] [%s]\n", $ssess, $log));
+    fwrite($fp, sprintf("MAIN: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log));
     fclose($fp);
   }
 }
 
 function log_rd($log) {
-  GLOBAL $sess;
+  GLOBAL $sess, $PHP_SELF;
 
   if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_READ) == 0)
     return;
@@ -2277,13 +2409,13 @@ function log_rd($log) {
     return;
 
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("READ: [%s] [%s]\n", $ssess, $log));
+    fwrite($fp, sprintf("READ: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log));
     fclose($fp);
   }
 }
 
 function log_rd2($log) {
-  GLOBAL $sess;
+  GLOBAL $sess, $PHP_SELF;
 
   if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_REA2) == 0)
     return;
@@ -2297,13 +2429,13 @@ function log_rd2($log) {
     return;
 
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("REA2: [%s] [%s]\n", $ssess, $log));
+    fwrite($fp, sprintf("REA2: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log));
     fclose($fp);
   }
 }
 
 function log_send($log) {
-  GLOBAL $sess;
+  GLOBAL $sess, $PHP_SELF;
 
   if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_SEND) == 0)
     return;
@@ -2317,13 +2449,13 @@ function log_send($log) {
     return;
 
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("SEND: [%s] [%s]\n", $ssess, $log));
+    fwrite($fp, sprintf("SEND: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log));
     fclose($fp);
   }
 }
 
 function log_lock($log) {
-  GLOBAL $sess;
+  GLOBAL $sess, $PHP_SELF;
 
   if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOCK) == 0)
     return;
@@ -2337,13 +2469,13 @@ function log_lock($log) {
     return;
 
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("LOCK: [%s] [%s]\n", $ssess, $log));
+    fwrite($fp, sprintf("LOCK: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log));
     fclose($fp);
   }
 }
 
 function log_wr($log) {
-  GLOBAL $sess;
+  GLOBAL $sess, $PHP_SELF;
 
   if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_WRIT) == 0)
     return;
@@ -2357,13 +2489,13 @@ function log_wr($log) {
     return;
 
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("WRIT: [%s] [%s]\n", $ssess, $log));
+    fwrite($fp, sprintf("WRIT: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log));
     fclose($fp);
   }
 }
 
 function log_load($log) {
-  GLOBAL $sess;
+  GLOBAL $sess, $PHP_SELF;
 
   if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOAD) == 0)
     return;
@@ -2377,12 +2509,13 @@ function log_load($log) {
     return;
       
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("LOAD: [%s] [%s]\n", $ssess, $log));
+    fwrite($fp, sprintf("LOAD: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log));
     fclose($fp);
   }
 }
 
 function log_auth($sess, $log) {
+    GLOBAL $PHP_SELF;
   if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_AUTH) == 0)
     return;
 
@@ -2390,7 +2523,7 @@ function log_auth($sess, $log) {
     return;
 
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("AUTH: [%s] [%d] [%s]\n", $sess, time(), $log));
+    fwrite($fp, sprintf("AUTH: [%s] [%d] [%s] [%s]\n", $sess, time(), $PHP_SELF, $log));
     fclose($fp);
   }
 }
@@ -2410,6 +2543,19 @@ function log_legal($curtime, &$user, $where, $mesg)
   }
 }
 
+function log_points($curtime, &$user, $where, $mesg) 
+{
+  GLOBAL $_SERVER;
+
+  if (($fp = @fopen(LEGAL_PATH."/points.log", 'a')) != FALSE) {
+    /* Unix time | session | nickname | IP | where was | mesg */
+    fwrite($fp, sprintf("%ld|%s|%s|%s|%s|%s|%s|\n", $curtime, $user->sess,
+                        ($user->flags & USER_FLAG_AUTH ? 'A' : 'N'),
+                        $user->name, $_SERVER['REMOTE_ADDR'], $where , $mesg));
+    fclose($fp);
+  }
+}
+
 
 
 
@@ -2465,6 +2611,12 @@ function show_notify($text, $tout, $butt, $w, $h)
   return sprintf('var noti = new notify(gst,"%s",%d,"%s",%d,%d);', $text, $tout, $butt, $w, $h);
 }
 
+function show_notify_ex($text, $tout, $butt, $w, $h, $is_opaque, $block_time)
+{
+  log_main("SHOW_NOTIFY OPAQUE: ".$text);
+  return sprintf('var noti = new notify_ex(gst,"%s",%d,"%s",%d,%d, %s, %d);', $text, $tout, $butt, $w, $h, ($is_opaque ? "true" : "false"), $block_time);
+}
+
 
 function root_wellcome($user)
 {