From: Matteo Nastasi (mop) <nastasi@alternativeoutput.it>
Date: Thu, 23 Jan 2014 17:35:47 +0000 (+0100)
Subject: Merge branch 'master', remote branch 'origin' into auto-maintenance
X-Git-Tag: v4.14.0~22
X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=43b825479e2c58fe49b714e8d09fbbf472b8e662;hp=-c;p=brisk.git

Merge branch 'master', remote branch 'origin' into auto-maintenance
---

43b825479e2c58fe49b714e8d09fbbf472b8e662
diff --combined web/Obj/user.phh
index 50fdd66,cf857dd..4754969
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@@ -67,7 -67,6 +67,7 @@@ define('USER_FLAG_TY_DISABLE', 0x800000
  define('USER_DIS_REA_INVMAIL', 1);
  define('USER_DIS_REA_LICENCE', 2);
  define('USER_DIS_REA_BANNED',  3);
 +define('USER_DIS_REA_MALICIOUS',  4);
  
  // 240 is the right value, 600 is for fwrite error test
  define('RD_ENDTIME_DELTA',  240);
@@@ -99,7 -98,7 +99,7 @@@ $mlang_user = array
                       );
  
  class User {
-   var $room;       // reference to the room where the user is registered
+   var $brisk;      // reference to the room where the user is registered
    var $idx;        // index in the room users array when you are in game
    var $idx_orig;   // index in the room table users array when you aren't in game
    var $code;       // authentication code
@@@ -155,11 -154,11 +155,11 @@@
    function User() {
    }
  
-   static function create(&$room, $idx, $name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") {
+   static function create(&$brisk, $idx, $name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") {
      if (($thiz = new User()) == FALSE)
        return (FALSE);
  
-     $thiz->room       = &$room;
+     $thiz->room       = &$brisk;
      $thiz->idx        = $idx;
      $thiz->idx_orig   = $idx;
      $thiz->code       = -1;
@@@ -685,7 -684,7 +685,7 @@@
            log_rd2("NEWSTAT: ".$this->stat);
        } /* if ($this->rd_step == -1) { */
        else {
-           /* $sem = Room::lock_data(FALSE); */
+           /* $sem = Brisk::lock_data(FALSE); */
            $S_load_stat['rU_heavy']++;
            
            if ($this->rd_step < $this->step) {
@@@ -693,7 -692,7 +693,7 @@@
                    if ($this->rd_step + COMM_N < $this->step) {
                        if (($this->rd_stat != $this->stat)) {
                            $to_stat = $this->stat;
-                           /* Room::unlock_data($sem); */
+                           /* Brisk::unlock_data($sem); */
                            log_load("RESYNC");
                            printf("xXx USER::MAINCHECK2 [%s]\n", get_class($this));
                            return ($this->page_sync($this->sess, ($to_stat == "table" ? "briskin5/index.php" : "index.php"), $this->table, $this->table_token));
@@@ -740,12 -739,12 +740,12 @@@
                } /* if ($this->the_end == TRUE) { ... */
            } /* if ($this->rd_step < $this->step) { */
            
-           /* Room::unlock_data($sem); */
+           /* Brisk::unlock_data($sem); */
        }  /* else of if ($this->rd_step == -1) { */
        
      
        return ($ret);
-   }  //   function maincheck (...
+   }  //   function maincheck(...
  
    public static function stream_fini($transp, $init_string, $is_unrecoverable)
  {
@@@ -809,11 -808,8 +809,8 @@@ function stream_main(&$body, $get, $pos
      
      $pre_main = gettimeofday(TRUE);
      
-     $old_stat  = $this->rd_stat;
-     $old_subst = $this->rd_subst;
-     $old_step  = $this->rd_step;
      printf("xXx PRE : rd_step %d\n", $this->rd_step);
-     if (($ret = $this->maincheck($old_stat, $old_subst, $old_step, $get, $post, $cookie)) != FALSE) {
+     if (($ret = $this->maincheck($get, $post, $cookie)) != FALSE) {
          $body .= $this->rd_transp->chunk( $this->rd_scristp++, $ret);
          log_rd2(0, 'index_rd.php: after mop_flush (begin: '.sprintf("%f", $pre_main).')');
      }