X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=5be9eac4d1b7f26b69581634c2bbe25fff01d25c;hb=ee01d2e98b1e7ff67640d27f88b6467ed6e87be4;hp=bd40259a7b6df2ae7c1b0e6177d5790a8e975076;hpb=bdb3cb2379f32bfb9279da661b1d4dbaf9712299;p=brisk.git

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index bd40259..5be9eac 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
@@ -129,12 +129,12 @@ $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.4.2 - 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>: nuovo calcolo dei punteggi (doppio oltre i 70, triplo oltre gli 80 etc...), più informazioni al tavolo.',
+$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>: new method to calculate points (double after 70, triple after 80 and so on ...), more info at the table.',
+                       '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' => '
@@ -277,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)
 {
@@ -573,9 +588,12 @@ 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,   0xf0000); // done
-define(USER_FLAG_TY_NORM,  0x10000); // done
-define(USER_FLAG_TY_SUPER, 0x20000); // done
+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
@@ -2031,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);