X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=inline;f=web%2FObj%2Fbrisk.phh;h=5be9eac4d1b7f26b69581634c2bbe25fff01d25c;hb=ee01d2e98b1e7ff67640d27f88b6467ed6e87be4;hp=0b6f6cf39b5345db9cdbfb06123ed4fb585163a4;hpb=fa82ba0deaaab26b5b9efe37c392a34cbec50a66;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 0b6f6cf..5be9eac 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -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.'), NOVITA\': 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.'), NOVITA\': informazioni al tavolo sul chiamante, nuovo stato di supporter del sito.',
'Se vuoi iscriverti alla Mailing List, cliccala!' ),
- 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: 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.'), NEWS: caller information on the table, new supporter status.',
'If you want to subscribe our Mailing List, click it!' ) );
$G_room_help = array( 'it' => '
@@ -277,6 +277,21 @@ Copyright 2006-2009 Matteo Nasta
version '.$G_brisk_version.'
Copyright 2006-2009 Matteo Nastasi (aka mop)
');
+$escinp_from = array( "\"" );
+$escinp_to = array( """ );
+
+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);