X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=6e0fcbbb04ed59e128c0531a2ae4617d08a5beaf;hb=254c175a7e331947c69794aa7a0248caa47e32f5;hp=09b1da8481e77cefe9dc96301132c4c4d82ba2d1;hpb=1ccc2ec3beebfc0939ce8558a15f23e99b29dcaa;p=brisk.git

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 09b1da8..6e0fcbb 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -854,6 +854,36 @@ class User {
       return (FALSE);
   }
 
+  static function step_get($sess)
+  {
+      $fp = FALSE;
+      do {
+          if (validate_sess($sess) == FALSE)
+              break;
+          
+          if (file_exists(PROXY_PATH) == FALSE)
+              mkdir(PROXY_PATH);
+          if (($fp = @fopen(PROXY_PATH."/".$sess.".step", 'rb')) == FALSE)
+              break;
+          if (($s = fread($fp, 8)) == FALSE)
+              break;
+          if (strlen($s) != 8)
+              break;
+          $arr = unpack('Ls/Li', $s);
+          fclose($fp);
+          
+          // log_rd2("A0: ".$arr[0]."  A1: ".$arr[1]);
+          return ($arr);
+      } while (0);
+      
+      if ($fp != FALSE)
+          fclose($fp);
+      
+      log_rd2("STEP_GET [".$sess."]: return false ");
+      
+      return (FALSE);
+  }
+
   function reset() {
     $curtime = time();
     log_legal($curtime, $this, "STAT:LOGOUT", '');
@@ -872,137 +902,104 @@ class User {
     $this->the_end = FALSE;
   }
 
-
-
-  // SHSPLIT save and load function for the User class.
   static function load_data($id, $sess) 
   {
-    // error_log("User::load_data BEGIN", 0);
-
-    log_main("load_data: id [".$id."] sess [".($sess == FALSE ? "FALSE" : $sess)."] ");
-
-    $doexit = FALSE;
-    do {
-      if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) {
-	log_main("ftok failed");
-	$doexit = TRUE;
-	break;
-      }
-    
-      if (($shm_sz = sharedmem_sz($tok)) == -1) {
-	log_main("shmop_open failed");
-      }
-	
-      if ($shm_sz == -1)
-	$shm_sz = SHM_DIMS_U_MIN;
-
-      if ($shm = shm_attach($tok, $shm_sz)) {
-	$user = @shm_get_var($shm, $tok);
-	
-        if ($sess != FALSE && $user->sess != $sess) {
-            $doexit = TRUE;
-            break;
-        }
-	log_only("user ==  ".($user == FALSE ?   "FALSE" : "TRUE")."  user ===  ".($user === FALSE ? "FALSE" : "TRUE")."  user isset ".(isset($user) ?   "TRUE" : "FALSE"));
-	if (isset($user)) 
-	  log_only("bri count ".count($user));
-	
-	if ($user == FALSE) {
-	  log_only("INIT MAIN DATA");
-	  
-          // SHSPLIT FIXME: init_data for User class ??
-	  $user = User::create($id, "", "");
-	  if (@shm_put_var($shm, $tok, $user) == FALSE) {
-              log_only("PUT_VAR FALLITA ".strlen(serialize($user)));
-              log_only(serialize($user));
-	  }
-	}
-
-	$user->shm_sz = $shm_sz;
-	
-	shm_detach($shm);
-      }
+      // error_log("User::load_data BEGIN", 0);
       
-      //  
-      // SHSPLIT: load users from the shared memory
-      //
-      return ($user);
-    } while (0);
-    
-    if ($doexit)
-      exit();
-    
-    return (FALSE);
+      log_main("load_data: id [".$id."] sess [".($sess == FALSE ? "FALSE" : $sess)."] ");
+      
+      $doexit = FALSE;
+      do {
+          if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) {
+              log_main("ftok failed");
+              $doexit = TRUE;
+              break;
+          }
+          
+          if (($shm_sz = sharedmem_sz($tok)) == -1) {
+              log_main("shmop_open failed");
+          }
+          
+          if ($shm_sz == -1)
+              $shm_sz = SHM_DIMS_U_MIN;
+          
+          if ($shm = shm_attach($tok, $shm_sz)) {
+              $user = @shm_get_var($shm, $tok);
+              
+              if ($sess != FALSE && $user->sess != $sess) {
+                  $doexit = TRUE;
+                  break;
+              }
+              log_only("user ==  ".($user == FALSE ?   "FALSE" : "TRUE")."  user ===  ".($user === FALSE ? "FALSE" : "TRUE")."  user isset ".(isset($user) ?   "TRUE" : "FALSE"));
+              if (isset($user)) 
+                  log_only("bri count ".count($user));
+              
+              if ($user == FALSE) {
+                  log_only("INIT MAIN DATA");
+                  
+                  // SHSPLIT FIXME: init_data for User class ??
+                  $user = User::create($id, "", "");
+                  if (@shm_put_var($shm, $tok, $user) == FALSE) {
+                      log_only("PUT_VAR FALLITA ".strlen(serialize($user)));
+                      log_only(serialize($user));
+                  }
+              }
+              
+              $user->shm_sz = $shm_sz;
+              
+              shm_detach($shm);
+          }
+          
+          //  
+          // SHSPLIT: load users from the shared memory
+          //
+          return ($user);
+      } while (0);
+      
+      if ($doexit)
+          exit();
+      
+      return (FALSE);
   }
   
 
-  function save_data($user, $id) 
+  static function save_data($user, $id) 
   {
-    GLOBAL $sess;
-    
-    $shm =   FALSE;
-    
-    // var_dump($user);
-    // error_log("User::save_data BEGIN", 0);
-
-    if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) {
-      return (FALSE);
-    }
-    while ($user->shm_sz < SHM_DIMS_U_MAX) {
-      if (($shm = shm_attach($tok, $user->shm_sz)) == FALSE)
-	break;
+      GLOBAL $sess;
       
-      // log_only("PUT_VAR DI ".strlen(serialize($user)));
-      if (shm_put_var($shm, $tok, $user) != FALSE) {
-	shm_detach($shm);
-	log_main("User[".$id."] saved.");
-	return (TRUE);
-      }
-      if (shm_remove($shm) === FALSE) {
-	log_only("REMOVE FALLITA");
-	break;
+      $shm =   FALSE;
+      
+      // var_dump($user);
+      // error_log("User::save_data BEGIN", 0);
+      
+      if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) {
+          return (FALSE);
       }
-      shm_detach($shm);
-      $user->shm_sz += SHM_DIMS_U_DLT;
-    } 
-
-    if ($shm)
-      shm_detach($shm);
-    
-    return (FALSE);
-  }
-
-
-  static function step_get($sess)
-  {
-      $fp = FALSE;
-      do {
-          if (validate_sess($sess) == FALSE)
+      while ($user->shm_sz < SHM_DIMS_U_MAX) {
+          if (($shm = shm_attach($tok, $user->shm_sz)) == FALSE)
               break;
           
-          if (file_exists(PROXY_PATH) == FALSE)
-              mkdir(PROXY_PATH);
-          if (($fp = @fopen(PROXY_PATH."/".$sess.".step", 'rb')) == FALSE)
-              break;
-          if (($s = fread($fp, 8)) == FALSE)
-              break;
-          if (strlen($s) != 8)
+          // log_only("PUT_VAR DI ".strlen(serialize($user)));
+          if (shm_put_var($shm, $tok, $user) != FALSE) {
+              shm_detach($shm);
+              log_main("User[".$id."] saved.");
+              return (TRUE);
+          }
+          if (shm_remove($shm) === FALSE) {
+              log_only("REMOVE FALLITA");
               break;
-          $arr = unpack('Ls/Li', $s);
-          fclose($fp);
-          
-          // log_rd2("A0: ".$arr[0]."  A1: ".$arr[1]);
-          return ($arr);
-      } while (0);
-      
-      if ($fp != FALSE)
-          fclose($fp);
+          }
+          shm_detach($shm);
+          $user->shm_sz += SHM_DIMS_U_DLT;
+      } 
       
-      log_rd2("STEP_GET [".$sess."]: return false ");
+      if ($shm)
+          shm_detach($shm);
       
       return (FALSE);
   }
 
+
 } // end class User
 
 
@@ -2502,7 +2499,7 @@ class Room {
       do {
           if (file_exists(PROXY_PATH) == FALSE)
               mkdir(PROXY_PATH);
-          if (($fp = @fopen(PROXY_PATH."/room_garbage_time.expired", 'rb')) == FALSE)
+          if (($fp = @fopen(PROXY_PATH."/garbage_time.expired", 'rb')) == FALSE)
               break;
           if (($s = fread($fp, 4)) == FALSE)
               break;
@@ -2526,7 +2523,7 @@ class Room {
       do {
           if (file_exists(PROXY_PATH) == FALSE)
               mkdir(PROXY_PATH);
-          if (($fp = @fopen(PROXY_PATH."/room_garbage_time.expired", 'wb')) == FALSE)
+          if (($fp = @fopen(PROXY_PATH."/garbage_time.expired", 'wb')) == FALSE)
               break;
           fwrite($fp, pack("L",$tm));
           fclose($fp);