X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=fde4a579a7eaffbd04e9d926f8645a78e01b4380;hb=8c2d162e7c87e54a07e174570196f62321231808;hp=a59cc4427793fdc26f4b7097d1307cde55f9d099;hpb=d61a2071d17756b22a3b7fac5b5efe2b0ba834b1;p=brisk.git

diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index a59cc44..fde4a57 100644
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -2,7 +2,7 @@
 /*
  *  brisk - Obj/user.phh
  *
- *  Copyright (C) 2012 Matteo Nastasi
+ *  Copyright (C) 2012-2015 Matteo Nastasi
  *                          mailto: nastasi@alternativeoutput.it 
  *                                  matteo.nastasi@milug.org
  *                          web: http://www.alternativeoutput.it
@@ -58,6 +58,7 @@ define('USER_FLAG_TY_ALL',     0xff0000); // done
 define('USER_FLAG_TY_NORM',    0x010000); // done
 define('USER_FLAG_TY_SUPER',   0x020000); // done
 define('USER_FLAG_TY_CERT',    0x040000); // done
+define('USER_FLAG_TY_APPR',    0x080000); // done
 //  ... other usefull status ...
 define('USER_FLAG_TY_FIRONLY', 0x200000); // done
 define('USER_FLAG_TY_ADMIN',   0x400000); // done
@@ -122,6 +123,8 @@ class User {
   var $cl_step;    // current step returned by client
   var $ping_req;   // ping is already requested ?
 
+  var $pend_async; // number of async check that must be returned
+
   var $rd_socket;  // socket handle of push stream
   var $rd_endtime; // end time for push stream
   var $rd_stat;    // actual status of push stream
@@ -184,6 +187,7 @@ class User {
     $thiz->trans_step = -1;
     $thiz->cl_step    = -1;
     $thiz->ping_req   = FALSE;
+    $thiz->pend_async = 0;
     $thiz->comm       = array();
 
     $thiz->rd_socket  = NULL;
@@ -199,7 +203,6 @@ class User {
     $thiz->rd_zls     = FALSE;
     $thiz->rd_transp  = NULL;
     $thiz->rd_is_chunked = FALSE;
-    $thiz->ping_req   = FALSE;
 
     $thiz->asta_card  = -2;
     $thiz->asta_pnt   = -1;
@@ -240,6 +243,7 @@ class User {
     $this->trans_step = $from->trans_step;
     $this->cl_step    = $from->cl_step;
     $this->ping_req   = $from->ping_req;
+    $this->pend_async = $from->pend_async;
     $this->comm       = array();
 
     $i_start = (1 > ($from->step - COMM_N) ? 1 : ($from->step - COMM_N)); 
@@ -305,6 +309,7 @@ class User {
     $thiz->trans_step = $from->trans_step;
     $thiz->cl_step    = $from->cl_step;
     $thiz->ping_req   = $from->ping_req;
+    $thiz->pend_async = $from->pend_async;
     $thiz->comm       = array();
 
     /*
@@ -340,6 +345,11 @@ class User {
     return ($thiz);
   }
 
+  function is_appr()
+  {
+      return ($this->flags & USER_FLAG_TY_APPR);
+  }
+
   function is_auth()
   {
       return ($this->flags & USER_FLAG_AUTH);
@@ -643,7 +653,8 @@ class User {
       
       log_rd2("do other cur_stat[".$this->rd_stat."] user->stat[".$this->stat."] cur_step[".$this->rd_step."] user_step[".$this->step."]");
       
-      if ($this->rd_step == -1) {
+      fprintf(STDERR, "ASYNC: %d %d\n", $this->rd_step, $this->pend_async);
+      if ($this->rd_step == -1 && $this->pend_async == 0) {
           /*  if $this->rd_step == -1 load the current state from the main struct  */
           $S_load_stat['wR_minusone']++;
 
@@ -658,7 +669,9 @@ class User {
           }
       }
       
-      
+      if ($this->pend_async > 0) {
+          return (FALSE);
+      }
       /* this part I suppose is read only on $this->room structure */
       if ($this->rd_step == -1) {
           log_rd2("PRE-NEWSTAT: ".$this->stat);
@@ -706,6 +719,7 @@ class User {
                                           ($is_super ? 0 : $G_splash_timeout));
                   $ret .= sprintf('|createCookie("CO_splashdate%d", %d, 24*365, cookiepath);', $G_splash_idx, $curtime);
               }
+              $this->room->standup_update($this);
               $ret .= $this->room->show_room($this->step, $this);
               
               // TODO uncomment and test
@@ -909,5 +923,33 @@ function chunked_fini()
 
 } // end class User
 
+if (!isset($__usersnet_friend_map)) {
+    $__usersnet_friend_map = array("black", "unknown", "test", "friend", "bff");
+}
+
+function usersnet_friend_getlabel($id)
+{
+    GLOBAL $__usersnet_friend_map;
 
+    $id_i = intval($id);
+
+    if ($id_i < 1 || $id_i > count($__usersnet_friend_map)) {
+        return FALSE;
+    }
+    return ($__usersnet_friend_map[$id_i - 1]);
+}
+
+/* return index + 1 of friend label */
+function usersnet_friend_getid($label_in)
+{
+    GLOBAL $__usersnet_friend_map;
+
+    foreach ($__usersnet_friend_map as $id => $label) {
+        if ($label == $label_in) {
+            return ($id + 1);
+        }
+    }
+
+    return FALSE;
+}
 ?>