X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=d6a4395afb1164bcd45c82078e693d82958c04cc;hb=e8903530a6cf61a0b06c63bbabed10a813fea097;hp=3ca1f97d6f7aad42a62dcff89cfc44c0dc2036c8;hpb=7f526939ded24298104cacd02b5f364bcc7bfa56;p=brisk.git

diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index 3ca1f97..d6a4395 100644
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -345,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);
@@ -618,7 +623,7 @@ class User {
       // log_rd2("page_sync:".var_export(debug_backtrace()));
       
       log_rd2("PAGE_SYNC");
-      printf("xXx USER::PAGE_SYNC [%s]\n", get_class($this));
+      // printf("xXx USER::PAGE_SYNC [%s]\n", get_class($this));
       return (sprintf('createCookie("table_idx", %d, 24*365, cookiepath); createCookie("table_token", "%s", 24*365, cookiepath); xstm.stop(); window.onunload = null; window.onbeforeunload = null; document.location.assign("%s");', $table_idx, $table_token, $page));
   }
 
@@ -648,7 +653,7 @@ class User {
       
       log_rd2("do other cur_stat[".$this->rd_stat."] user->stat[".$this->stat."] cur_step[".$this->rd_step."] user_step[".$this->step."]");
       
-      fprintf(STDERR, "ASYNC: %d %d\n", $this->rd_step, $this->pend_async);
+      // 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']++;
@@ -702,7 +707,8 @@ class User {
                       }
                   }
               }
-              if ($G_with_splash &&
+              // if ($G_with_splash &&
+              if ($this->is_auth() && (! $this->is_appr()) && $G_with_splash &&
                   ($splashdate < $curtime - $G_splash_interval ||
                    $splashdate > $curtime)) {
                   $is_super = $this->flags & USER_FLAG_TY_SUPER;
@@ -730,7 +736,7 @@ class User {
            ***************/
           else if ($this->stat == 'table') {
               log_load("RESYNC");
-              printf("xXx USER::MAINCHECK1 [%s]\n", get_class($this));
+              // printf("xXx USER::MAINCHECK1 [%s]\n", get_class($this));
 
               return ($this->page_sync($this->sess, "briskin5/index.php", $this->table, $this->table_token));
           }
@@ -745,7 +751,7 @@ class User {
                       if (($this->rd_stat != $this->stat)) {
                           $to_stat = $this->stat;
                           log_load("RESYNC");
-                          printf("xXx USER::MAINCHECK2 [%s]\n", get_class($this));
+                          // 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));
                       }
                       log_rd2("lost history, refresh from scratch");
@@ -783,7 +789,7 @@ class User {
 
   public static function stream_fini($transp, $init_string, $is_unrecoverable)
 {
-    printf("xXx user::stream_fini\n");
+    // printf("xXx user::stream_fini\n");
 
     // FIXME: dynamic "Transport_" type
     $trans_class = Transport::gettype($transp);
@@ -808,7 +814,7 @@ function stream_init($init_string, $enc, $header, &$header_out, &$body, $get, $p
 {
     $curtime = time();
     
-    printf("CLASS: [%s] base: [%s]\n", get_class($this), self::base_get());
+    // printf("CLASS: [%s] base: [%s]\n", get_class($this), self::base_get());
 
     log_load("index_rd_init.php");
     
@@ -825,7 +831,7 @@ function stream_init($init_string, $enc, $header, &$header_out, &$body, $get, $p
     
     $this->rd_data_set($curtime, $transp, $enc, $stat, $subst, $step, $from);
     
-    $ret = $this->rd_transp->init($enc, $header, &$header_out, $init_string, self::base_get(), $this->rd_scristp);
+    $ret = $this->rd_transp->init($enc, $header, $header_out, $init_string, self::base_get(), $this->rd_scristp);
 
     if ($ret === FALSE) {
         return FALSE;
@@ -843,12 +849,12 @@ function stream_main(&$body, $get, $post, $cookie)
     
     $pre_main = gettimeofday(TRUE);
     
-    printf("xXx PRE : rd_step %d\n", $this->rd_step);
+    // printf("xXx PRE : rd_step %d\n", $this->rd_step);
     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).')');
     }
-    printf("xXx POST: rd_step %d\n", $this->rd_step);
+    // printf("xXx POST: rd_step %d\n", $this->rd_step);
 
     return TRUE;
 }
@@ -863,10 +869,15 @@ function stream_close()
     return ($this->rd_transp->close());
 }
 
+function stream_postclose_get($sock, $curtime)
+{
+    return ($this->rd_transp->postclose_get($sock, $curtime));
+}
+
 static function base_get()
 {
     $c = get_called_class();
-    printf("CALLED_CLASS: [%s]\n", $c);
+    // printf("CALLED_CLASS: [%s]\n", $c);
     return $c::BASE;
 }
 
@@ -918,5 +929,39 @@ function chunked_fini()
 
 } // end class User
 
+define('USERSNET_FRIEND_BLACK', 1);
+define('USERSNET_FRIEND_UNKNOWN', 2);
+define('USERSNET_FRIEND_TEST', 3);
+define('USERSNET_FRIEND_FRIEND', 4);
+define('USERSNET_FRIEND_BFF', 5);
+
+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;
+}
 ?>