X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=c829980df8aa68b6507aa7697e667a3b50a2ad28;hb=8e74a78fab641d685d534a821f114eda7c2cdd78;hp=4abdd86693f724d1606de5875f48aa741be97832;hpb=e71902002186de31f72f2ceed43f90dfc2efd19e;p=brisk.git diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh index 4abdd86..c829980 100644 --- a/web/Obj/brisk.phh +++ b/web/Obj/brisk.phh @@ -1079,7 +1079,9 @@ class Room { $curtime = time(); // externalized if ($force || $this->garbage_timeout < $curtime) { - if ($force || Room::garbage_time_is_expired($curtime)) { + if (!$force && !Room::garbage_time_is_expired($curtime)) { + return ($ismod); + } // FIXME BRISK4: include for each kind of table require_once("${G_base}briskin5/Obj/briskin5.phh"); @@ -1143,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"); @@ -1231,7 +1234,6 @@ class Room { // externalized $this->garbage_timeout = time() + GARBAGE_TIMEOUT; Room::garbage_time_expire_set($curtime + GARBAGE_TIMEOUT); $ismod = TRUE; - } return ($ismod); }