X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=000ad970e220f6b2af37016daa1eb4a73b67007c;hb=db12d769481823f4c744ce0e3a50404cc6b01cd1;hp=99952e48d0f18b207c267f4959dc2ea3e16b92cf;hpb=7f9618888f9963c4a7daebeb9e3d14ef0a56b968;p=brisk.git

diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index 99952e4..000ad97 100644
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -707,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;
@@ -923,6 +924,12 @@ 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");
 }
@@ -933,9 +940,23 @@ function usersnet_friend_getlabel($id)
 
     $id_i = intval($id);
 
-    if ($id_i < 0 || $id_i >= count($__usersnet_friend_map)) {
+    if ($id_i < 1 || $id_i > count($__usersnet_friend_map)) {
         return FALSE;
     }
-    return ($__usersnet_friend_map[$id_i]);
+    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;
 }
 ?>