X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2FObj%2Fbrisk.phh;h=8b126412119aa64766e1ebd9adc072aea3bd00dd;hb=78f44060729d1f0c82a396aab1d05cbb75226d2d;hp=039118e8f20b5a82a5fe6d0d0b273b7cefa70e95;hpb=185142647b92fdc00d2a85c098d8eb8656cf4a8d;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 039118e..8b12641 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -135,10 +135,10 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi',
$G_lng = langtolng($G_lang);
$G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "3.5.3";
+$G_brisk_version = "3.5.5";
/* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': terza versione di test per la nuova gestione dei dati volatili, rivista gestione del ticker.',
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': quinta versione di test per la nuova gestione dei dati volatili, rivista gestione del ticker.',
'Se vuoi iscriverti alla Mailing List, cliccala!' ),
'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: third test version for the new volatile data management, ticker management refactored.',
'If you want to subscribe our Mailing List, click it!' ) );
@@ -1145,7 +1145,8 @@ class Room {
$this->room_join_wakeup($user_cur, FALSE, 0);
$table_cur->table_token = "";
$table_cur->wakeup_time = $curtime + WAKEUP_TIME;
- Bin5::destroy_data($table_idx);
+
+ $bri->destroy_data($table_idx);
}
else {
log_main("gm:: save_data");
@@ -2577,6 +2578,16 @@ function btrace_line($ar)
return ($ret);
}
+function trace_ftok($id, $add)
+{
+ // NOTE: without space to use sed to substitute "= @ftok(" with "= @ftok("
+ $tok=@ftok($id, $add);
+
+ log_shme($tok.": ".$id." + ".$add);
+
+ return ($tok);
+}
+
function log_mop($step, $log)
{
GLOBAL $sess, $PHP_SELF;
@@ -3036,7 +3047,7 @@ function sharedmem_sz($tok)
class Warrant {
static $delta_t;
- function lock_data()
+ static function lock_data()
{
GLOBAL $sess;
@@ -3056,7 +3067,7 @@ class Warrant {
return (FALSE);
}
- function unlock_data($res)
+ static function unlock_data($res)
{
GLOBAL $sess;
@@ -3069,7 +3080,7 @@ class Warrant {
class Poll {
static $delta_t;
- function lock_data()
+ static function lock_data()
{
GLOBAL $sess;
@@ -3090,7 +3101,7 @@ class Poll {
return (FALSE);
}
- function unlock_data($res)
+ static function unlock_data($res)
{
GLOBAL $sess;