From: Matteo Nastasi (mop) <nastasi@alternativeoutput.it>
Date: Wed, 8 Oct 2014 17:05:36 +0000 (+0200)
Subject: Merge branch 'curls' into curl-out-reason
X-Git-Tag: v4.15.0~4
X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=aa1fa37d0bd35d6f8d7b55ec1a6a92140f4ce9e0;hp=706f411d26dee22befc679885d715dd620b674e5;p=brisk.git

Merge branch 'curls' into curl-out-reason
---

diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index 68b686d..6cdb1fe 100644
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -751,19 +751,16 @@ class User {
                   log_rd2("LOGOUT BYE BYE!!");
                   log_auth($this->sess, "Explicit logout.");
                   
-                  if ($this->the_end == TRUE) {
-                      $this->reset();
-                      
-                      if ($this->subst == 'sitdown') {
-                          log_load("ROOM WAKEUP");
-                          $this->room->room_wakeup($this);
-                      }
-                      else if ($this->subst == 'standup')
-                          $this->room->room_outstandup($this);
-                      else
-                          log_rd2("LOGOUT FROM WHAT ???");
-                      
-                  } /* if ($this->the_end == TRUE) { ... */
+                  $this->reset();
+
+                  if ($this->subst == 'sitdown') {
+                      log_load("ROOM WAKEUP");
+                      $this->room->room_wakeup($this);
+                  }
+                  else if ($this->subst == 'standup')
+                      $this->room->room_outstandup($this);
+                  else
+                      log_rd2("LOGOUT FROM WHAT ???");
               } /* if ($this->the_end == TRUE) { ... */
           } /* if ($this->rd_step < $this->step) { */
       }  /* else of if ($this->rd_step == -1) { */
diff --git a/web/index_wr.php b/web/index_wr.php
index eae9bfe..28b476e 100644
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -834,6 +834,11 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
          *                    *
          **********************/
         else if ($user->subst == 'sitdown') {
+            if ($user->the_end == TRUE) {
+                log_wr("INFO:SKIP:argz == sitdown && ->the_end == TRUE => ignore request.");
+                return FALSE;
+            }
+
             if ($argz[0] == 'wakeup') {
                 $brisk->room_wakeup($user);
             }